]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2afc92f 09b15c5)
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 02:03:50 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 02:03:50 +0000 (12:03 +1000)
Conflicts:
arch/x86/xen/Makefile

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

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