Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000e/ich8lan.c drivers/net/e1000e/netdev.c
This commit is contained in:
@@ -73,7 +73,7 @@ void __rtnl_unlock(void)
|
||||
|
||||
void rtnl_unlock(void)
|
||||
{
|
||||
mutex_unlock(&rtnl_mutex);
|
||||
/* This fellow will unlock it for us. */
|
||||
netdev_run_todo();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user