]> git.proxmox.com Git - mirror_ubuntu-disco-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)
commit867f503d580eafbcc342141bae53cf6a27d413b1
treecae3f24edb3c309d0157f278d3bbe0d720f43997
parent5b8ce5eb81220b6329c467f76d1bfc9959dbfffc
parent1a5ab4b3e6087726dfc00207b36c91d3061468e8
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