diff options
author | 2013-05-24 13:17:49 -0700 | |
---|---|---|
committer | 2013-05-24 15:50:28 -0700 | |
commit | f4ae176c626311d6507c9a2d263657c4cc4e1667 (patch) | |
tree | 9eaca6153773efaa1b61b8a68beda4e21a21c851 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes (diff) | |
parent | ARM: sunxi: select ARCH_REQUIRE_GPIOLIB (diff) | |
download | wireguard-linux-f4ae176c626311d6507c9a2d263657c4cc4e1667.tar.xz wireguard-linux-f4ae176c626311d6507c9a2d263657c4cc4e1667.zip |
Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixes
From Maxime Ripard:
Small set of fixes for 3.10:
- Fix build breakage in pinctrl driver when no other architecture is selected
- Fix Mini X-plus device tree build
* tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux:
ARM: sunxi: select ARCH_REQUIRE_GPIOLIB
ARM: sunxi: Fix Mini X-plus device tree build
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions