]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fda473c 306e4b3)
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)
Conflicts:
arch/x86/xen/Kconfig

1  2 
arch/x86/xen/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/Kconfig
Simple merge
Linux kernel for KaRo TX COM modules