diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
| commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
| tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /arch/arm/mach-ixp4xx/omixp-setup.c | |
| parent | Merge branch 'imx/board' into next/board (diff) | |
| parent | ARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff) | |
| download | linux-335332770c68649ffeaf5dc2b58d9cd40041e295.tar.xz linux-335332770c68649ffeaf5dc2b58d9cd40041e295.zip | |
Merge branch 'depends/rmk/gpio' into next/board
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'arch/arm/mach-ixp4xx/omixp-setup.c')
0 files changed, 0 insertions, 0 deletions