]> 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: 6b7daf5 3b4866c)
Merge remote-tracking branch 'xen/upstream/xen'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 07:26:30 +0000 (17:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 07:26:30 +0000 (17:26 +1000)
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