]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:31:02 +0000 (11:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:31:02 +0000 (11:31 +1000)
commitc43523e074385cafec050ef34507eb66978e0b6f
tree452c605d338e10ee4a9dcbaa646ee633f102720e
parent09943a41218fe639adf262321c7218784f6fe4ab
parent2a22b634997e16f378097816944229cbafac556c
Merge branch 'quilt/rr'

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