| commit | 0c9de3c52d2baed6bc2ee44885adb418152c71c4 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Fri Sep 21 13:48:01 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Fri Sep 21 13:48:01 2012 -0700 |
| tree | e19ab2c41ae47250fd614418022b32aa783aa563 | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 [diff] | |
| parent | 3c7c5dab44d6c8861bc86dab924353d8d40344f8 [diff] |
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer Conflicts: arch/arm/mach-omap2/timer.c