diff options
| author |   Simon Horman <horms+renesas@verge.net.au> | 2013-06-07 14:26:22 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-07 14:26:22 +0900 |
| commit | a961ee1c95cb7309f619e9e68fe8c4fb73bedf6f (patch) | |
| tree | 54f50bcbd0baa55be24ac7ffbf547b4b55d046a4 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | ARM: shmobile: marzen: Use RCAR_GP_PIN macro (diff) | |
| parent | ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate (diff) | |
| download | linux-dev-a961ee1c95cb7309f619e9e68fe8c4fb73bedf6f.tar.xz linux-dev-a961ee1c95cb7309f619e9e68fe8c4fb73bedf6f.zip | |
Merge branches 'pinmux' and 'soc' into boards-base
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions