From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Apr 2012 02:48:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'xen-two/linux-next'
X-Git-Tag: next-20120402~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a512aa6a13db036ee2443187b5e7edda9fc113bd;p=karo-tx-linux.git

Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
	arch/x86/include/asm/io_apic.h
	arch/x86/kernel/apic/io_apic.c
---

a512aa6a13db036ee2443187b5e7edda9fc113bd