diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-07-04 00:29:31 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-07-04 00:29:31 -0700 |
| commit | 3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c (patch) | |
| tree | a10372c71503f2ee6e4cdfef42357dce8b620e02 /arch/arm/mach-omap2/control.h | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| parent | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 (diff) | |
| parent | c59b537d87068be8c357a0150f6172a2dc8cdf82 (diff) | |
| parent | 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf (diff) | |
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2