diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-02-07 15:19:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:19:08 -0800 |
| commit | e69128b947da0a2474447868f73c76311e2baedb (patch) | |
| tree | 73f84e2a0e55bcda2e14d28b011c250a14203e0d /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'mxs/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc (diff) | |
| parent | ARM: at91/at91sam9x5: Device tree definition files (diff) | |
| download | linux-dev-e69128b947da0a2474447868f73c76311e2baedb.tar.xz linux-dev-e69128b947da0a2474447868f73c76311e2baedb.zip | |
Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc
* 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91:
ARM: at91/at91sam9x5: Device tree definition files
ARM: at91/at91sam9x5: SoC basic support
ARM: at91/at91sam9x5: Configuration and Makefile
ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family
ARM: at91/at91sam9x5: PMC header file
ARM: at91/at91sam9x5: overall definition
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions