From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Aug 2010 17:08:52 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.36-rc2~3
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=bc584c5107bfd97e2aa41c798e3b213bcdd4eae7

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
---

bc584c5107bfd97e2aa41c798e3b213bcdd4eae7