diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:18:10 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:18:10 +0000 |
| commit | bd4b9ba4cf9338932a065cd752fb5f28b26e4e39 (patch) | |
| tree | 88725708d3f2696f1c2373cf62d0b997c207e861 /arch/arm/mach-pxa/include/mach/gpio.h | |
| parent | e814fb635cd269532a6a95a921c05841ababa7ae (diff) | |
| parent | 8a44930a11de8d66f92145fd2d2464ab4fba696b (diff) | |
| download | blackbird-obmc-linux-bd4b9ba4cf9338932a065cd752fb5f28b26e4e39.tar.gz blackbird-obmc-linux-bd4b9ba4cf9338932a065cd752fb5f28b26e4e39.zip | |
Merge branch 'samsung/cleanup' into next/drivers
Dependency for the samsung/drivers branch
Conflicts:
arch/arm/mach-exynos/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/gpio.h')
0 files changed, 0 insertions, 0 deletions
