diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 02:26:47 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 02:26:47 +0400 |
commit | 9f48c89862e39b7f33b44123fc425cf901c89428 (patch) | |
tree | 373886606ada8c2e0c362afbcce490af27d21552 /arch/arm64/include/asm/Kbuild | |
parent | 2a211f320ee3d86835b40efd2948642482d3c933 (diff) | |
parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
download | linux-9f48c89862e39b7f33b44123fc425cf901c89428.tar.xz |
Merge 3.16-rc5 into char-misc-next
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/include/asm/Kbuild')
-rw-r--r-- | arch/arm64/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild index 42c7eecd2bb6..0b3fcf86e6ba 100644 --- a/arch/arm64/include/asm/Kbuild +++ b/arch/arm64/include/asm/Kbuild @@ -30,7 +30,6 @@ generic-y += msgbuf.h generic-y += mutex.h generic-y += pci.h generic-y += poll.h -generic-y += posix_types.h generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h |