git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0a154d
62cae50
)
Merge branch 'for_3.1/i2c-andy' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Tony Lindgren
<tony@atomide.com>
Mon, 11 Jul 2011 13:29:33 +0000
(06:29 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 11 Jul 2011 13:29:33 +0000
(06:29 -0700)
Conflicts:
include/linux/i2c-omap.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff