diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/net/wireless/b43/main.c | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
| download | kernel_samsung_smdk4412-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip kernel_samsung_smdk4412-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.gz kernel_samsung_smdk4412-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.bz2 | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 19b4eae..4c41cfe 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -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) { |