From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 04:35:55 +0000 (+1100)
Subject: Merge remote-tracking branch 'xen-two/linux-next'
X-Git-Tag: next-20111221~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f63bdacc3da8fe4ac0f666db63974deb61d5a26a;p=karo-tx-linux.git

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

Conflicts:
	arch/x86/xen/Kconfig
---

f63bdacc3da8fe4ac0f666db63974deb61d5a26a