]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitb588498304c2ae2ce563018d5afeb2e6ceefb2b9
tree2ab769046cbaf78faae468512e8edac7f2486eb3
parente00bc3829dcd38252fcf8037b4f4cfd19b20b583
parent2a22b634997e16f378097816944229cbafac556c
Merge branch 'quilt/rr'

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