]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Aug 2011 15:42:16 +0000 (08:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Aug 2011 15:42:16 +0000 (08:42 -0700)
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: fix check_bytes() for slub debugging
  slub: Fix full list corruption if debugging is on


Trivial merge