| commit | fda87903f4e9caf87e02d52768c2611e417b7efb | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Thu Jan 05 11:05:51 2012 -0700 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Thu Jan 05 11:05:51 2012 -0700 |
| tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 | |
| parent | 1a0703ede4493bd74f9c6b53f782b749e175a88e [diff] | |
| parent | 2de0dbc5f6830e7659083d1929f57cb88b16a3b6 [diff] |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next Conflicts: drivers/gpio/gpio-pl061.c