diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:30 -0400 |
| commit | a0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch) | |
| tree | 2cad553a9def773ce79b8fc793f89c0634187109 /arch/blackfin/mach-bf518/include/mach/gpio.h | |
| parent | 89ccf465abe6b20d804a63ae20307970c441369d (diff) | |
| parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/mach-bf518/include/mach/gpio.h')
| -rw-r--r-- | arch/blackfin/mach-bf518/include/mach/gpio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf518/include/mach/gpio.h b/arch/blackfin/mach-bf518/include/mach/gpio.h index 9757683c3948..bbab2d76499c 100644 --- a/arch/blackfin/mach-bf518/include/mach/gpio.h +++ b/arch/blackfin/mach-bf518/include/mach/gpio.h | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * File: arch/blackfin/mach-bf518/include/mach/gpio.h | ||
| 3 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
| 4 | * | ||
| 5 | * Copyright (C) 2008 Analog Devices Inc. | 2 | * Copyright (C) 2008 Analog Devices Inc. |
| 6 | * Licensed under the GPL-2 or later. | 3 | * Licensed under the GPL-2 or later. |
| 7 | */ | 4 | */ |