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 /tools/perf/scripts/python | |
| parent | Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm... (diff) | |
| parent | ARM: OMAP: use consistent error checking (diff) | |
| download | linux-43231b5be657fde1c4ced180d829bbd59ceef9ad.tar.gz 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 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions