]> 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, 14 Dec 2011 04:07:19 +0000 (15:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 04:07:19 +0000 (15:07 +1100)
commit26620fecda8c41049de8a9b02f4662dddbb1d7cf
treee26374976555aec951c6430284e584dceff0b3c3
parentffea3cdc09b28248e0d89659d5cb0cc11b16b69b
parent54e6a3c0579f6bc6dcf7af57d1439b5b1a29dd07
Merge remote-tracking branch 'xen-two/linux-next'

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