| commit | c226feb013ce81a18512fb4827bf7c2352d8b470 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Wed Jun 08 09:12:16 2011 -0600 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Wed Jun 08 09:12:16 2011 -0600 |
| tree | 4415ebda1c24f68bd7b88641f64097111eb359e0 | |
| parent | 32919a28cc8470b1526f77b2f12cca8841b9ac62 [diff] | |
| parent | 85ec7b970553369e0c956fab1d7a6022f2a99369 [diff] |
Merge branch 'for_3.0/gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/merge