]> 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: f1d1c40 a1b02cb)
Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:41:07 +0000 (14:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 04:41:07 +0000 (14:41 +1000)
1  2 
virt/kvm/arm/arch_timer.c patch | diff1 | diff2 | blob | history

diff --cc virt/kvm/arm/arch_timer.c
Simple merge
Linux kernel for KaRo TX COM modules