diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 01:29:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 01:29:02 -0400 |
| commit | ae94b8075a2ed58d2318ef03827b25bc844f844e (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /drivers/usb/host/ohci-sa1111.c | |
| parent | eca91e7838ec92e8c12122849ec7539c4765b689 (diff) | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
Merge branch 'linus' into x86/core
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/host/ohci-sa1111.c')
| -rw-r--r-- | drivers/usb/host/ohci-sa1111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 0f48f2d99226..2e9dceb9bb99 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * SA1111 Bus Glue | 8 | * SA1111 Bus Glue |
| 9 | * | 9 | * |
| 10 | * Written by Christopher Hoover <ch@hpl.hp.com> | 10 | * Written by Christopher Hoover <ch@hpl.hp.com> |
| 11 | * Based on fragments of previous driver by Rusell King et al. | 11 | * Based on fragments of previous driver by Russell King et al. |
| 12 | * | 12 | * |
| 13 | * This file is licenced under the GPL. | 13 | * This file is licenced under the GPL. |
| 14 | */ | 14 | */ |