Arnd Bergmann c37d6154c0 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>		2012-10-04 22:57:51 +02:00
..
boot	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-03-30 18:15:43 -07:00
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
include	Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic	2012-10-04 22:57:51 +02:00
kernel	mtd/uclinux: Use generic __bss_stop instead of _ebss	2012-06-27 09:59:43 +02:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next	2012-03-30 12:10:03 +02:00
mm	microblaze: Port OOM changes to do_page_fault	2012-05-25 06:34:34 +02:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
platform	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	2012-07-30 17:25:21 -07:00
Kconfig.debug	microblaze: remove obsolete DEBUG_BOOTMEM	2011-01-10 09:29:51 +01:00
Makefile	Fix common misspellings	2011-03-31 11:26:23 -03:00