| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Tue Oct 14 22:24:42 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Oct 14 22:24:42 2008 +0100 |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c [diff] | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 [diff] |
Merge branch 'omap-all' into devel Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c