| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Wed Jun 15 14:57:39 2011 -0600 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Wed Jun 15 14:57:39 2011 -0600 |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 | |
| parent | 12610be33df5563d3f8cb141f231d4dc5b2a317f [diff] | |
| parent | df2212270ce94f12e9caed6ca04c7077672d588e [diff] |
Merge branch 'gpio/next-tegra' into gpio/next Conflicts: drivers/gpio/Kconfig drivers/gpio/Makefile