linux-next: manual merge of the hdlc tree

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/hdlc_fr.c between commit
54364b752ef0c91fe92684df000cc4593d1e8963 ("Add missing skb->dev
assignment in Frame Relay RX code") from the net tree and commit
41274d8181eca88e7ac2d7e82f804263a4f23ce4 ("WAN: Use struct
net_device_stats built into struct net_device.") from the hdlc tree
(which seem sto also exist in the net tree).

Just contextual.  I kept in the net tree's addition.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/