]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge commit 'refs/next/20111219/rr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 02:38:52 +0000 (13:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 02:38:52 +0000 (13:38 +1100)
1  2 
drivers/net/virtio_net.c

Simple merge