]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:35:55 +0000 (15:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:35:55 +0000 (15:35 +1100)
commitf63bdacc3da8fe4ac0f666db63974deb61d5a26a
treee73d43bf34afa3a1dd7702b7c84c825940af48a7
parent19bdaf0899c0ea7932d485c4e48240af4d44a25d
parentebde9b516a043da816dd26bad31208ea58de3713
Merge remote-tracking branch 'xen-two/linux-next'

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