]> 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: e5fdfd6 3153e9a)
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 04:38:59 +0000 (14:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 04:38:59 +0000 (14:38 +1000)
1  2 
arch/x86/kernel/setup.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/setup.c
Simple merge
Linux kernel for KaRo TX COM modules