diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
| commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
| tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /drivers/usb | |
| parent | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/ir-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index b679a556b98d..4e2cda93da59 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * Introduced common header to be used also in USB Gadget Framework. | 26 | * Introduced common header to be used also in USB Gadget Framework. |
| 27 | * Still needs some other style fixes. | 27 | * Still needs some other style fixes. |
| 28 | * | 28 | * |
| 29 | * 2007_Jun_21 Alan Cox <alan@redhat.com> | 29 | * 2007_Jun_21 Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 30 | * Minimal cleanups for some of the driver problens and tty layer abuse. | 30 | * Minimal cleanups for some of the driver problens and tty layer abuse. |
| 31 | * Still needs fixing to allow multiple dongles. | 31 | * Still needs fixing to allow multiple dongles. |
| 32 | * | 32 | * |