Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	sound/core/memalloc.c
This commit is contained in:
David S. Miller
2008-10-11 12:39:35 -07:00
3711 changed files with 190093 additions and 87746 deletions

View File

@@ -1106,7 +1106,7 @@ static int __devexit myri_sbus_remove(struct of_device *op)
struct myri_eth *mp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = mp->dev;
unregister_netdevice(net_dev);
unregister_netdev(net_dev);
free_irq(net_dev->irq, net_dev);