Merge 3.18-rc3 into staging-next

We want the upstream fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-02 18:06:03 -08:00
parent 9056be3054 0df1f2487d
commit 7cbe010a5e
947 changed files with 19600 additions and 8811 deletions
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -375,6 +375,7 @@ header-y += swab.h
 header-y += synclink.h
 header-y += sysctl.h
 header-y += sysinfo.h
+header-y += target_core_user.h
 header-y += taskstats.h
 header-y += tcp.h
 header-y += tcp_metrics.h