]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:03:02 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:03:02 +0000 (12:03 +1000)
commitc30a8f1da2c867dbf2879384a0f9e051cab52d4f
tree52d289ae653ebac7e8d89974ea87445ee2dfa378
parentf841a6966825e7aed7b371914cb5421a85f79064
parent2a22b634997e16f378097816944229cbafac556c
Merge branch 'quilt/rr'

Conflicts:
arch/arm/kernel/kprobes.c
drivers/virtio/virtio_balloon.c
init/main.c
Documentation/virtual/virtio-spec.txt