git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1a0703e
2de0dbc
)
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio...
author
Grant Likely
<grant.likely@secretlab.ca>
Thu, 5 Jan 2012 18:05:51 +0000
(11:05 -0700)
committer
Grant Likely
<grant.likely@secretlab.ca>
Thu, 5 Jan 2012 18:05:51 +0000
(11:05 -0700)
Conflicts:
drivers/gpio/gpio-pl061.c
Trivial merge