From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2011 03:01:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'xen/upstream/xen'
X-Git-Tag: next-20110822~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a4c2fe48f64209762ca466bdc25bc79e5837260;p=karo-tx-linux.git

Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
	arch/x86/xen/Makefile
---

2a4c2fe48f64209762ca466bdc25bc79e5837260