diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 22:21:32 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 22:21:32 -0800 |
| commit | a93d620159524088d9633f60a8f746e3dd2e791e (patch) | |
| tree | 09da5c10d18adc2b27ee88dcf5673e92d49b4043 /tools/perf/scripts/python | |
| parent | GPIO: clps711x: use platform_device_unregister in gpio_clps711x_init() (diff) | |
| parent | ARM: clps711x: merge files related to EDB7211-board into one (diff) | |
| download | linux-a93d620159524088d9633f60a8f746e3dd2e791e.tar.gz linux-a93d620159524088d9633f60a8f746e3dd2e791e.zip | |
Merge branch 'clps711x/soc' into clps711x/soc2
Conflicts:
arch/arm/Kconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions