2 Commits

Author	SHA1	Message	Date
Marcelo Tosatti	19bf7f8ac3	Merge remote-tracking branch 'master' into queue ... Merge reason: development work has dependency on kvm patches merged upstream. Conflicts: arch/powerpc/include/asm/Kbuild arch/powerpc/include/asm/kvm_para.h Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>	2012-10-29 19:15:32 -02:00
David Howells	c3617f7203	UAPI: (Scripted) Disintegrate arch/powerpc/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:26 +01:00