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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index b5860b97a93e..24fd613466b7 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -459,6 +459,7 @@ static void __exit lapbeth_cleanup_driver(void)
         list_for_each_safe(entry, tmp, &lapbeth_devices) {
                 lapbeth = list_entry(entry, struct lapbethdev, node);
 
+                dev_put(lapbeth->ethdev);
                 unregister_netdevice(lapbeth->axdev);
         }
         rtnl_unlock();