]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Jan 2014 19:06:16 +0000 (11:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Jan 2014 19:06:16 +0000 (11:06 -0800)
commit77d143de75812596a58d126606f42d1214e09dde
tree2f462fdf839e914fda343dfd3682b914b0a796f4
parentccc039d65f24172eebab5e0160462d3417799af5
parent9e443bc369e04b8db3266d7253ce7c1eee2ec979
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML changes from Richard Weinberger:
 "This time only various cleanups and housekeeping patches"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: hostfs: make functions static
  um: Include generic barrier.h
  um: Removed unused attributes from thread_struct
arch/um/include/asm/Kbuild