| commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Oct 21 16:46:26 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Oct 21 16:46:26 2011 +0200 |
| tree | a48e86b9f9a80913399a182a152b4c580a9c3836 | |
| parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 [diff] | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 [diff] |
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