diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:14:34 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:14:34 +0400 |
| commit | f7a0fd56e4f58aec3300082fc10433052e2f1863 (patch) | |
| tree | 4b3348f4866f6b3417f456a298229d63d4581424 /arch/arm/include/asm/Kbuild | |
| parent | 5e1e704a7de14ae79dc4d983dbbcab67064960c9 (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| download | linux-f7a0fd56e4f58aec3300082fc10433052e2f1863.tar.xz | |
Merge 3.12-rc6 into staging-next.
We want these fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/include/asm/Kbuild')
| -rw-r--r-- | arch/arm/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index d3db39860b9c..59ceae8f3c95 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -31,5 +31,4 @@ generic-y += termbits.h generic-y += termios.h generic-y += timex.h generic-y += trace_clock.h -generic-y += types.h generic-y += unaligned.h |