| commit | adf11b62f3ef59b72f280df44f129e36091b242f | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Fri May 18 16:50:01 2012 -0600 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Fri May 18 16:50:01 2012 -0600 |
| tree | a9165d05b06db4bdaa2402f6cd469195ff693119 | |
| parent | d6de85e85edcc38c9edcde45a0a568818fcddc13 [diff] | |
| parent | b3c64bc30af67ed328a8d919e41160942b870451 [diff] |
Merge branch 'for_3.5/fixes/gpio-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next