2 Commits

Author	SHA1	Message	Date
Martin Schwidefsky	ab08ff34b4	Merge tag 'disintegrate-s390-20121009' of ... git://git.infradead.org/users/dhowells/linux-headers Pull UAPI patchset from David Howells: "Can you merge the following branch into the s390 tree please. This is to complete part of the UAPI disintegration for which the preparatory patches were pulled recently." Conflicts: arch/s390/include/asm/chpid.h	2012-10-09 14:18:10 +02:00
David Howells	9807f75955	UAPI: (Scripted) Disintegrate arch/s390/include/asm ... Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>	2012-10-09 09:47:31 +01:00