git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0fa5c8
9c00b43
)
Merge branch 'i2c' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Tue, 6 Mar 2012 22:49:59 +0000
(14:49 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 6 Mar 2012 22:49:59 +0000
(14:49 -0800)
Conflicts:
arch/arm/plat-omap/omap_device.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff