diff options
author | 2014-08-24 11:19:37 -0700 | |
---|---|---|
committer | 2014-08-24 11:19:58 -0700 | |
commit | 9d0b1f345e91acd458592d47430142073362b8cc (patch) | |
tree | 59d250cf2a3aa96c143c0a69d8d0d4019ebdabb8 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'sunxi-dt-for-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes (diff) | |
parent | MAINTAINERS: add new Rockchip SoC list (diff) | |
download | linux-dev-9d0b1f345e91acd458592d47430142073362b8cc.tar.xz linux-dev-9d0b1f345e91acd458592d47430142073362b8cc.zip |
Merge tag 'v3.17-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
Merge "ARM: rockchip: fix for 3.17" from Heiko Stubner:
Pinctrl that got accidentially dropped when reorganizing the
dts files and addition of the new Rockchip list to MAINTAINERS.
* tag 'v3.17-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
MAINTAINERS: add new Rockchip SoC list
ARM: dts: rockchip: readd missing mmc0 pinctrl settings
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions