diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:13:11 -0400 |
| commit | 8b3f6af86378d0a10ca2f1ded1da124aef13b62c (patch) | |
| tree | de6ca90295730343c495be8d98be8efa322140ef /arch/arm/boot/compressed/head-sa1100.S | |
| parent | 139d6065c83071d5f66cd013a274a43699f8e2c1 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
Diffstat (limited to 'arch/arm/boot/compressed/head-sa1100.S')
| -rw-r--r-- | arch/arm/boot/compressed/head-sa1100.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head-sa1100.S b/arch/arm/boot/compressed/head-sa1100.S index 4c8c0e46027d..6179d94dd5c6 100644 --- a/arch/arm/boot/compressed/head-sa1100.S +++ b/arch/arm/boot/compressed/head-sa1100.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/boot/compressed/head-sa1100.S | 2 | * linux/arch/arm/boot/compressed/head-sa1100.S |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1999 Nicolas Pitre <nico@cam.org> | 4 | * Copyright (C) 1999 Nicolas Pitre <nico@fluxnic.net> |
| 5 | * | 5 | * |
| 6 | * SA1100 specific tweaks. This is merged into head.S by the linker. | 6 | * SA1100 specific tweaks. This is merged into head.S by the linker. |
| 7 | * | 7 | * |