tree ca306d89f64ceeee92531cc0a9ba5d246d09f044
parent 12610be33df5563d3f8cb141f231d4dc5b2a317f
parent df2212270ce94f12e9caed6ca04c7077672d588e
author Grant Likely <grant.likely@secretlab.ca> 1308171459 -0600
committer Grant Likely <grant.likely@secretlab.ca> 1308171459 -0600

Merge branch 'gpio/next-tegra' into gpio/next

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile