]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:42:32 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:42:32 +0000 (11:42 +1000)
1  2 
drivers/net/virtio_net.c

Simple merge