Merge branch 'gpio/next-mx' into gpio/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 6 Jun 2011 16:10:07 +0000 (10:10 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 6 Jun 2011 16:10:07 +0000 (10:10 -0600)
commit8c31b1635b91e48f867e010cd7bcd06393e5858a
tree4981add7e38e24724d255dedeb03f93be34d33ec
parent121a2dd860f8348fb014b660f133a0cb9a16273e
parent2ce420da39078a6135d1c004a0e4436fdc1458b4
Merge branch 'gpio/next-mx' into gpio/next
drivers/gpio/Kconfig
drivers/gpio/Makefile