diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-22 10:54:12 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-22 10:54:12 -0800 |
| commit | 04aa67dec63b61c1a8b9b6d001262250f1a92130 (patch) | |
| tree | 7e0d2cfb30f904ffbd2ac39a055cd53034c873b7 /tools/perf/scripts/python | |
| parent | OMAP4: hwmod data: Prevent timer1 to be reset and idle during init (diff) | |
| parent | OMAP2+: musb: hwmod adaptation for musb registration (diff) | |
| download | linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.tar.gz linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.zip | |
Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions