tree f6b5ff90350cf7f8d803c3b25d4b2b174b3e17f0
parent d661d76b0262f3ed649a1dea24c0119757592b09
parent 00afa758067ac1c947149ef766adcdfe30c44d7d
author Linus Torvalds <torvalds@linux-foundation.org> 1262207665 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262207665 -0800

Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/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