diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /drivers/usb/host/ehci-ixp4xx.c | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'drivers/usb/host/ehci-ixp4xx.c')
| -rw-r--r-- | drivers/usb/host/ehci-ixp4xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c index f9575c409124..9c32063a0c2f 100644 --- a/drivers/usb/host/ehci-ixp4xx.c +++ b/drivers/usb/host/ehci-ixp4xx.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * IXP4XX EHCI Host Controller Driver | 2 | * IXP4XX EHCI Host Controller Driver |
| 3 | * | 3 | * |
| 4 | * Author: Vladimir Barinov <vbarinov@ru.mvista.com> | 4 | * Author: Vladimir Barinov <vbarinov@embeddedalley.com> |
| 5 | * | 5 | * |
| 6 | * Based on "ehci-fsl.c" by Randy Vinson <rvinson@mvista.com> | 6 | * Based on "ehci-fsl.c" by Randy Vinson <rvinson@mvista.com> |
| 7 | * | 7 | * |