]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm...
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 1 Aug 2011 14:16:05 +0000 (15:16 +0100)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 1 Aug 2011 14:16:05 +0000 (15:16 +0100)
commit71493cf409ea34dda809a14971bdc4e3185659f9
treecae3f24edb3c309d0157f278d3bbe0d720f43997
parente295373b8903c3963c225b65166e50f7abd14598
parent66dada72319ca3ea6b370ed792fcbf20575f569f
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next

Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
arch/arm/mach-msm/Kconfig
arch/arm/mach-msm/Makefile
drivers/gpio/Kconfig
drivers/gpio/Makefile