| commit | 36c48f8cc5fc0558c1109a84b0832a26c384d8f1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 22 11:15:33 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 22 11:15:33 2010 -0700 |
| tree | d88904ac2960e3d7498cfeed25145834cb7a62fd | |
| parent | 1482338f6242dbaea46039c5f1b4604a472b364b [diff] | |
| parent | 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c [diff] |
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