diff options
author | 2011-08-01 15:16:05 +0100 | |
---|---|---|
committer | 2011-08-01 15:16:05 +0100 | |
commit | 867f503d580eafbcc342141bae53cf6a27d413b1 (patch) | |
tree | cae3f24edb3c309d0157f278d3bbe0d720f43997 /tools/perf/scripts/python/syscall-counts.py | |
parent | gpio: ab8500: fix MODULE_ALIAS for ab8500 (diff) | |
parent | gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers (diff) | |
download | linux-dev-867f503d580eafbcc342141bae53cf6a27d413b1.tar.xz linux-dev-867f503d580eafbcc342141bae53cf6a27d413b1.zip |
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions