]> 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, 30 Nov 2011 03:18:12 +0000 (14:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:18:12 +0000 (14:18 +1100)
commit0e2026210a9dc2e52ab015789f7a591b2abd29b5
tree7b324a003628b550912364e7a656e07b8f940884
parentfda473c618d3d550a75dd3c9aee22fc7acd78dd5
parent306e4b3066e1ace0264beb96e850b3772c7c2876
Merge remote-tracking branch 'xen-two/linux-next'

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