diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:13:15 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:13:15 -0800 |
| commit | 9c7bc451e41abf78b0fd856a9f916f7d39e26297 (patch) | |
| tree | d643495fab1eb013ae3f5e689cf3cec9702b8f62 /arch/arm/mach-omap1/board-ams-delta.c | |
| parent | 2862945bf5262d516583477ce420a2f122306f43 (diff) | |
| parent | 662b083a87a3489f3f19c6e0651c1b99b0de5df0 (diff) | |
| parent | 1cb125caf2e0fdece14f72efbb3516f5c5fe1de9 (diff) | |
Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus