commit | 1486a7409b42ec434be310e091ef68660a2f6cd0 | [log] [tgz] |
---|---|---|
author | Grant Likely <grant.likely@secretlab.ca> | Fri May 27 23:52:58 2011 -0600 |
committer | Grant Likely <grant.likely@secretlab.ca> | Fri May 27 23:52:58 2011 -0600 |
tree | aea9fb012b3d7221a4b46f50a10edf809ee49f9a | |
parent | bc786ccead15262a12bd673ed7a5afa6cbf0edcf [diff] | |
parent | e5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1 [diff] |
Merge branch 'for_2.6.40/gpio-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next