]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:29:47 +0000 (13:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 02:29:47 +0000 (13:29 +1100)
1  2 
drivers/net/virtio_net.c

Simple merge