Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 0 insertions, 1 deletions

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 20deb14e98ff..982ff12764a3 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3004,7 +3004,6 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
         dev->base_addr = (long) pdev;
 
         hp = netdev_priv(dev);
-        memset(hp, 0, sizeof(*hp));
 
         hp->happy_dev = pdev;
         hp->dma_dev = &pdev->dev;