diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
| commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 (patch) | |
| tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 /tools/perf/scripts/python | |
| parent | ARM: shmobile: r8a7779: Remove INTC function GPIOs (diff) | |
| parent | ARM: shmobile: r8a7790 SoC 64-bit DT support (diff) | |
| download | linux-809609a5d8427b0025304dbb69a84a692d11c4f9.tar.gz linux-809609a5d8427b0025304dbb69a84a692d11c4f9.zip | |
Merge branch 'soc' into pinmux-base
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions