diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-26 15:37:57 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-26 15:37:57 -0500 |
| commit | cf2394f70cf7774a107fbaa1ef5010db4bd69baa (patch) | |
| tree | e79e3e479d04213a67ecd47b31c7db648b0313c2 /include/uapi/linux/Kbuild | |
| parent | 45fc84c668ba6cc08cbae74042be838bf9283d98 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge tag 'v3.18-rc4' into regulator-max77802
Linux 3.18-rc4
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 6cad97485bad..b70237e8bc37 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild | |||
| @@ -374,6 +374,7 @@ header-y += swab.h | |||
| 374 | header-y += synclink.h | 374 | header-y += synclink.h |
| 375 | header-y += sysctl.h | 375 | header-y += sysctl.h |
| 376 | header-y += sysinfo.h | 376 | header-y += sysinfo.h |
| 377 | header-y += target_core_user.h | ||
| 377 | header-y += taskstats.h | 378 | header-y += taskstats.h |
| 378 | header-y += tcp.h | 379 | header-y += tcp.h |
| 379 | header-y += tcp_metrics.h | 380 | header-y += tcp_metrics.h |