]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Apr 2010 18:15:33 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Apr 2010 18:15:33 +0000 (11:15 -0700)
commite16b60d864684ddda17e32f84ee0719e1550397a
treed88904ac2960e3d7498cfeed25145834cb7a62fd
parent83478ede07c5028d3946baff831f04a8d17b7058
parent3b9b55f8a2cb306089980b6a153d8cdc58e5703f
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  uml: Fix build breakage after slab.h changes