Skip to content
Commit 36c48f8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1482338f 7f3c1fa4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment