diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 22:44:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 22:44:25 +0200 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/uwb/umc-dev.c | |
| parent | niu: Recognise original ethtool class code for AH/ESP flow hashing (diff) | |
| parent | caif: performance bugfix - allow radio stack to prioritize packets. (diff) | |
| download | linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.xz linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/uwb/umc-dev.c')
| -rw-r--r-- | drivers/uwb/umc-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c index ccd2184e05d2..b2948ec57878 100644 --- a/drivers/uwb/umc-dev.c +++ b/drivers/uwb/umc-dev.c @@ -78,7 +78,7 @@ EXPORT_SYMBOL_GPL(umc_device_register); * First we unregister the device, make sure the driver can do it's * resource release thing and then we try to release any left over * resources. We take a ref to the device, to make sure it doesn't - * dissapear under our feet. + * disappear under our feet. */ void umc_device_unregister(struct umc_dev *umc) { |