diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 15:14:39 -0500 |
| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 (patch) | |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 /arch/blackfin/mach-bf527/include/mach/gpio.h | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 (diff) | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff) | |
Merge branch 'for-linus' into for-2.6.33
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/blackfin/mach-bf527/include/mach/gpio.h')
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/gpio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/gpio.h b/arch/blackfin/mach-bf527/include/mach/gpio.h index 06b6eebf0d49..104bff85290d 100644 --- a/arch/blackfin/mach-bf527/include/mach/gpio.h +++ b/arch/blackfin/mach-bf527/include/mach/gpio.h | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * File: arch/blackfin/mach-bf527/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 | */ |