Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/net/tcp.h
This commit is contained in:
@@ -2958,7 +2958,7 @@ static void do_periodic_work(struct b43_wldev *dev)
|
||||
/* Periodic work locking policy:
|
||||
* The whole periodic work handler is protected by
|
||||
* wl->mutex. If another lock is needed somewhere in the
|
||||
* pwork callchain, it's aquired in-place, where it's needed.
|
||||
* pwork callchain, it's acquired in-place, where it's needed.
|
||||
*/
|
||||
static void b43_periodic_work_handler(struct work_struct *work)
|
||||
{
|
||||
|
Reference in New Issue
Block a user