]> 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: e00bc38 2a22b63)
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:39:06 +0000 (12:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:39:06 +0000 (12:39 +1000)
Conflicts:
arch/arm/kernel/kprobes.c
arch/arm/kernel/smp.c
drivers/virtio/virtio_balloon.c
init/main.c

1  2 
Documentation/virtual/virtio-spec.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/virtual/virtio-spec.txt
Simple merge
Linux kernel for KaRo TX COM modules