diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-02 21:06:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-02 21:06:03 -0500 |
| commit | 7cbe010a5ea728d7c4440b11a1a3997faca0e46d (patch) | |
| tree | 9132c4c60a236f58f532086a0d8b8cc3fdf180fc /include/uapi/linux/Kbuild | |
| parent | 9056be30542bfff51190bdda67088f319cf4c9f5 (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
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>
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 5f17fa7bc153..d0df45685a4c 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild | |||
| @@ -375,6 +375,7 @@ header-y += swab.h | |||
| 375 | header-y += synclink.h | 375 | header-y += synclink.h |
| 376 | header-y += sysctl.h | 376 | header-y += sysctl.h |
| 377 | header-y += sysinfo.h | 377 | header-y += sysinfo.h |
| 378 | header-y += target_core_user.h | ||
| 378 | header-y += taskstats.h | 379 | header-y += taskstats.h |
| 379 | header-y += tcp.h | 380 | header-y += tcp.h |
| 380 | header-y += tcp_metrics.h | 381 | header-y += tcp_metrics.h |