| commit | 79ab2664336d73245023a236345bb31f2b0a2dfe | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Thu Jul 05 08:18:04 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Thu Jul 05 08:18:04 2012 -0700 |
| tree | 16fb7f77074a39b74aecbf324b0b7de2eaf6d094 | |
| parent | ecc46cfdad7499a21296f0757059c4965f1fbc98 [diff] | |
| parent | e30384abd63dfa11508a38243e1d78f1d70486b1 [diff] |
Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data OMAP AM33xx clock data Conflicts: arch/arm/mach-omap2/Makefile