From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Jan 2014 19:06:16 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77d143de75812596a58d126606f42d1214e09dde;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' of git://git./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
---

77d143de75812596a58d126606f42d1214e09dde
diff --cc arch/um/include/asm/Kbuild
index 75de4abe4f94,fb3a6cc23015..88a330dcdede
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@@ -4,4 -4,4 +4,5 @@@ generic-y += ftrace.h pci.h io.h param.
  generic-y += switch_to.h clkdev.h
  generic-y += trace_clock.h
  generic-y += preempt.h
 +generic-y += hash.h
+ generic-y += barrier.h