| commit | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Thu Jun 28 05:47:01 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Thu Jun 28 05:47:01 2012 -0700 |
| tree | 2b026da522975ca03bfcdd80b66bb266ed6553a9 | |
| parent | 5f6129675bf17aeda5385830c446b91899cb6812 [diff] | |
| parent | 19f3a98d82cabdff5a1a437811d472ef52f34954 [diff] |
Merge branch 'cleanup-hwmod' into cleanup Conflicts: arch/arm/mach-omap2/dsp.c