| commit | e9308cfd5ab4ade3d81cf591c7599c3a05a21b04 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 14 17:07:52 2011 +1200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 14 17:07:52 2011 +1200 |
| tree | d1ca7c4ee3ba7d563d83af5b20ac25c30817bd19 | |
| parent | 480082968a78151e731ebd304eeb6cada61a1cd1 [diff] | |
| parent | 25fcf2b7f1f65d2cc12182ced3ccd47576970be4 [diff] |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio-pca953x: fix gpio_base gpio/omap: fix build error with certain OMAP1 configs