]> 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>
Tue, 13 Dec 2011 05:22:03 +0000 (16:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 05:22:03 +0000 (16:22 +1100)
commit78603604fb30de67ee4546200f8e70eb780cd33c
treed08460ee3ad7206f801251b40d752abf4f8a153a
parent8411cf632e0b10402e7665cf0c66a61c7a94e458
parent54e6a3c0579f6bc6dcf7af57d1439b5b1a29dd07
Merge remote-tracking branch 'xen-two/linux-next'

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