diff options
| author |   Tony Lindgren <tony@atomide.com> | 2011-07-10 11:48:26 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-10 11:48:26 -0700 |
| commit | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (patch) | |
| tree | cea7ef733c50025496f554f114173e49e52d3028 /tools/perf/scripts/python | |
| parent | OMAP4: Keyboard: Mux changes in the board file (diff) | |
| parent | Merge branch 'peter/topic/for-tony_mach-cleanup' of git://gitorious.org/omap-audio/linux-audio into cleanup-part-2 (diff) | |
| download | linux-dev-1ad920556f32a5a127397ca461d1a1faaf22c4e0.tar.xz linux-dev-1ad920556f32a5a127397ca461d1a1faaf22c4e0.zip | |
Merge branch 'cleanup-part-2' into devel-board
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions