tree 7a24522c56d1cb284dff1d3c225bbdaba0901bb5
parent e7a570ff7dff9af6e54ff5e580a61ec7652137a0
parent 8a1ab3155c2ac7fbe5f2038d6e26efeb607a1498
author Arnd Bergmann <arnd@arndb.de> 1349384220 +0200
committer Arnd Bergmann <arnd@arndb.de> 1349384271 +0200

Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic

Patches from David Howells <dhowells@redhat.com>:

This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently.

Note that there are some fixup patches which are at the base of the
branch aimed at you, plus all arches get the asm-generic branch merged in too.

* 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/asm-generic
  UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
  c6x: remove c6x signal.h
  UAPI: Split compound conditionals containing __KERNEL__ in Arm64
  UAPI: Fix the guards on various asm/unistd.h files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>