Merge branch 'quilt/rr'
commitcba035a0bde7dfc1eaa66ffc86f192ac0f861dc2
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:21:54 +0000 (31 12:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:21:54 +0000 (31 12:21 +1000)
tree36045d05e4d9d3ec62029983e581a8460fadfaa1
parentdc46b870a9b48029ec41b906ab0a2546bba703be
parent5e7a6e8040d4fec2133df61647d8026ceb866fb9
Merge branch 'quilt/rr'
drivers/net/virtio_net.c