diff options
author | 2013-08-21 14:31:33 -0700 | |
---|---|---|
committer | 2013-08-21 14:31:45 -0700 | |
commit | f7b29518c33a0fe48cf13b7e2eb04a5fdb11293d (patch) | |
tree | 95fbf77fe352b583c628b1c725ed1d40b903e812 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'tegra-for-3.12-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc (diff) | |
parent | ARM: sunxi: Remove Makefile.boot file (diff) | |
download | wireguard-linux-f7b29518c33a0fe48cf13b7e2eb04a5fdb11293d.tar.xz wireguard-linux-f7b29518c33a0fe48cf13b7e2eb04a5fdb11293d.zip |
Merge tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux into next/soc
Allwinner sunXi core additions for 3.12
There's not much in this pull request, only a patch removing some dead code.
* tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux:
ARM: sunxi: Remove Makefile.boot file
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions