]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 660696d f42798c)
Merge branch 'kvm-arm-cleanup' from git://github.com/columbia/linux-kvm-arm.git
authorGleb Natapov <gleb@redhat.com>
Thu, 25 Apr 2013 15:23:48 +0000 (18:23 +0300)
committerGleb Natapov <gleb@redhat.com>
Thu, 25 Apr 2013 15:23:48 +0000 (18:23 +0300)
1  2 
arch/arm/kernel/asm-offsets.c patch | diff1 | diff2 | blob | history
arch/arm/kvm/arm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/kernel/asm-offsets.c
Simple merge
diff --cc arch/arm/kvm/arm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.