]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 04:48:49 +0000 (14:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 04:48:49 +0000 (14:48 +1000)
1  2 
drivers/net/virtio_net.c

Simple merge