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

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

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

26620fecda8c41049de8a9b02f4662dddbb1d7cf