diff options
author | 2013-12-27 13:24:15 -0800 | |
---|---|---|
committer | 2013-12-27 13:24:15 -0800 | |
commit | a7fb16fad69bf05488ece74988331a5b38c35369 (patch) | |
tree | 1667cffde9f215d53dbbbc359dfdfa9f24df6013 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'tegra-for-3.14-trusted-foundations' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers (diff) | |
parent | ARM: sun4i/sun7i: RTC driver (diff) | |
download | linux-dev-a7fb16fad69bf05488ece74988331a5b38c35369.tar.xz linux-dev-a7fb16fad69bf05488ece74988331a5b38c35369.zip |
Merge tag 'sunxi-drivers-for-3.14' of https://github.com/mripard/linux into next/drivers
From Maxime Ripard:
Allwinner SoC additions for 3.14
Two drivers are merged through for 3.14:
- The A10/A20 RTC driver
- The A31 reset controller IP
* tag 'sunxi-drivers-for-3.14' of https://github.com/mripard/linux:
ARM: sun4i/sun7i: RTC driver
ARM: sun4i/sun7i: DT documentation for RTC driver
reset: Add Allwinner SoCs Reset Controller Driver
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