diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-03 10:32:47 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-03 10:32:47 -0700 |
| commit | 43231b5be657fde1c4ced180d829bbd59ceef9ad (patch) | |
| tree | c20d5c79e63533abf71ab8f89598eb777e9bee2b /arch/arm/mach-omap2/board-generic.c | |
| parent | 105612489bf59386b46b3f9f034e03f70e57aee6 (diff) | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| download | linux-43231b5be657fde1c4ced180d829bbd59ceef9ad.tar.gz linux-43231b5be657fde1c4ced180d829bbd59ceef9ad.tar.bz2 linux-43231b5be657fde1c4ced180d829bbd59ceef9ad.zip | |
Merge commit '7185684' into omap-for-v3.10/timer
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
0 files changed, 0 insertions, 0 deletions