]> 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: 5aca496 ec8161f)
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 05:17:01 +0000 (16:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 05:17:01 +0000 (16:17 +1100)
1  2 
arch/x86/xen/time.c patch | diff1 | diff2 | blob | history

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