| commit | 967809bd7faf71ddc29c8081e0f21db8b201a0f4 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Fri Jan 20 05:31:52 2012 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Fri Jan 20 05:31:52 2012 -0800 |
| tree | 256bcce2b13a45b573b02ef73dcebe1f08a03593 | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f [diff] | |
| parent | 8d09a1bb3147ddbcf0a9483021ca699c54c54732 [diff] |
Merge branch 'omap1-part2' into omap1 Conflicts: drivers/leds/leds-ams-delta.c