]> 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)
commit9e27ccc04a3a41a11a85cc28df8b219292f74567
treecae3f24edb3c309d0157f278d3bbe0d720f43997
parentb02c39b4e9a7582f5f0b25840c31caac4d8d1aa0
parent3358769601497bbcbe5f54922418770b53742f52
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