linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell <hidden>
Date: 2010-07-21 02:04:58
Also in:
lkml, netdev
Hi all,
Today's linux-next merge of the net tree got a conflict in
net/bridge/br_device.c between commit
573201f36fd9c7c6d5218cdcd9948cee700b277d ("bridge: Partially disable
netpoll support") from Linus' tree and commit
91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support")
from the net tree.
The net tree commit seems to be a fuller fix, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 490 bytes