projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc4fc29 18e5b53)
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Apr 2010 15:38:27 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Apr 2010 15:38:27 +0000 (08:38 -0700)
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  nodemask: include slab.h from drivers/base/node.c


Trivial merge
John Crispins staging tree