projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a28e085 1ab335d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
authorLinus Torvalds <[email protected]>
Sun, 22 Aug 2010 17:08:52 +0000 (10:08 -0700)
committerLinus Torvalds <[email protected]>
Sun, 22 Aug 2010 17:08:52 +0000 (10:08 -0700)
* '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

1  2 
include/linux/slub_def.h patch | diff1 | diff2 | blob | history
mm/slab.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/slub_def.h
Simple merge
diff --cc mm/slab.c
Simple merge
John Crispins staging tree