| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Nov 02 02:46:10 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Nov 02 02:46:10 2011 +0100 |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 [diff] | |
| parent | 8b61f37440388ebbd2a894178fe098f2e70ab392 [diff] |
Merge branch 'highbank/soc' into next/soc Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/mach-omap2/board-generic.c arch/arm/plat-mxc/include/mach/gpio.h