]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 01:10:56 +0000 (12:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 01:10:56 +0000 (12:10 +1100)
1  2 
drivers/net/virtio_net.c

Simple merge