summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 17:36:23 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 17:36:23 +0100
commit14577beb8293c187a12d2e78ac6250d5dcec2190 (patch)
treecca4d8feba497870e3a5936ba2a65c68ce4ddf6b /drivers/nfc
parentsd: Fail discard requests when logical block provisioning has been disabled (diff)
parentMerge branch 'slub/lockless' into for-linus (diff)
downloadlinux-14577beb8293c187a12d2e78ac6250d5dcec2190.tar.xz
linux-14577beb8293c187a12d2e78ac6250d5dcec2190.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Dont define useless label in the !CONFIG_CMPXCHG_LOCAL case slab,rcu: don't assume the size of struct rcu_head slub,rcu: don't assume the size of struct rcu_head slub: automatically reserve bytes at the end of slab Lockless (and preemptless) fastpaths for slub slub: Get rid of slab_free_hook_irq() slub: min_partial needs to be in first cacheline slub: fix ksize() build error slub: fix kmemcheck calls to match ksize() hints Revert "slab: Fix missing DEBUG_SLAB last user" mm: Remove support for kmem_cache_name()
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions