Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 21:14:25 +0000 (13:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 21:14:25 +0000 (13:14 -0800)
commitf8e9766dd1bacd5f32f9ac4322b55fbfd46b778e
treef6b5ff90350cf7f8d803c3b25d4b2b174b3e17f0
parentd661d76b0262f3ed649a1dea24c0119757592b09
parent00afa758067ac1c947149ef766adcdfe30c44d7d
Merge branch 'slab/urgent' of git://git./linux/kernel/git/penberg/slab-2.6

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  SLAB: Fix lockdep annotation breakage