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)
commit2bc7c85210d75b7a8a7326284b4f608a16f52ffc
treeca306d89f64ceeee92531cc0a9ba5d246d09f044
parent12610be33df5563d3f8cb141f231d4dc5b2a317f
parentdf2212270ce94f12e9caed6ca04c7077672d588e
Merge branch 'gpio/next-tegra' into gpio/next

Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
arch/arm/mach-ep93xx/core.c
drivers/gpio/Makefile
drivers/gpio/gpio-exynos4.c