diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:19:53 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:19:53 -0700 |
| commit | 73c5ef126f40b0b872e5964ff65dbe792eeec493 (patch) | |
| tree | 064ab090a0b8cdda4f542ecd308c17fcee349aae /arch/arm/plat-omap | |
| parent | 582c77d783e0cb1e6c30a330e42582173bcadfd2 (diff) | |
| parent | 243e76b426e6e040961b84249b4eaab4ad9fa6dc (diff) | |
| parent | 64be97822b781e921c7eda2d4089fd1fdf3aabba (diff) | |
Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus