]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Aug 2010 17:08:52 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Aug 2010 17:08:52 +0000 (10:08 -0700)
commitbc584c5107bfd97e2aa41c798e3b213bcdd4eae7
tree13cb518e2f4f2aac46aefbbaacb6e4fa3fbb58a2
parenta28e0852d45e65d9edf249c36e432b5e0a80f01d
parent1ab335d8f85792e3b107ff8237d53cf64db714df
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:
  slab: fix object alignment
  slub: add missing __percpu markup in mm/slub_def.h
include/linux/slub_def.h
mm/slab.c