Subject: linux-next: manual merge of the net tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Apr 2009 11:06:12 +1000

Hi David,

Today's linux-next merge of the net tree got a conflict in net/core/dev.c
between commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf ("net: Fix GRO
for multiple page fragments") from the net-current tree and commit
76620aafd66f0004829764940c5466144969cffc ("gro: New frags interface to
avoid copying shinfo") from the net tree.

I used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/