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)
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


Trivial merge