git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12610be df22122)
Merge branch 'gpio/next-tegra' into gpio/next
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 15 Jun 2011 20:57:39 +0000 (14:57 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 15 Jun 2011 20:57:39 +0000 (14:57 -0600)
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile


Trivial merge
Pandora Kernel Repository