summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2011-03-20 17:13:26 +0100
committerPekka Enberg <penberg@kernel.org>2011-03-20 17:13:26 +0100
commite8c500c2b64b6e237e67ecba7249e72363c47047 (patch)
treee9c62e59a879ebef45b0fc2823d318b2fb2fed84 /drivers/macintosh
parentMerge branch 'slab/next' into for-linus (diff)
parentslub: Dont define useless label in the !CONFIG_CMPXCHG_LOCAL case (diff)
downloadlinux-e8c500c2b64b6e237e67ecba7249e72363c47047.tar.xz
linux-e8c500c2b64b6e237e67ecba7249e72363c47047.zip
Merge branch 'slub/lockless' into for-linus
Conflicts: include/linux/slub_def.h
Diffstat (limited to 'drivers/macintosh')
0 files changed, 0 insertions, 0 deletions