diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 17:34:26 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 17:34:26 +1100 |
| commit | 27a0464a6cb837d3a90b6e69365dfc01cb0dff2f (patch) | |
| tree | 361f00f4d4ad4c01b6144c52004bee2b948742ad /drivers/sh/maple/maple.c | |
| parent | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (diff) | |
| parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) | |
| download | kernel_samsung_espresso10-27a0464a6cb837d3a90b6e69365dfc01cb0dff2f.zip kernel_samsung_espresso10-27a0464a6cb837d3a90b6e69365dfc01cb0dff2f.tar.gz kernel_samsung_espresso10-27a0464a6cb837d3a90b6e69365dfc01cb0dff2f.tar.bz2 | |
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'drivers/sh/maple/maple.c')
| -rw-r--r-- | drivers/sh/maple/maple.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index d1812d3..63f0de2 100644 --- a/drivers/sh/maple/maple.c +++ b/drivers/sh/maple/maple.c @@ -827,7 +827,7 @@ static int __init maple_bus_init(void) maple_queue_cache = kmem_cache_create("maple_queue_cache", 0x400, 0, - SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL); + SLAB_HWCACHE_ALIGN, NULL); if (!maple_queue_cache) goto cleanup_bothirqs; |