From: Arnd Bergmann Date: Thu, 4 Oct 2012 20:57:00 +0000 (+0200) Subject: Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells... X-Git-Tag: v3.7-rc1~78^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c37d6154c0b9163c27e53cc1d0be3867b4abd760;hp=-c;p=pandora-kernel.git Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic Patches from David Howells : 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 --- c37d6154c0b9163c27e53cc1d0be3867b4abd760