git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4fa8eeb
8583e90
ce01d60
ace6dd5
)
Merge omap-for-linus devel-fixes for-next omap-testing cbus testing-i2c
author
Tony Lindgren
<tony@atomide.com>
Mon, 21 Mar 2011 15:33:16 +0000
(08:33 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 21 Mar 2011 15:33:16 +0000
(08:33 -0700)
Merge branches 'omap-for-linus', 'devel-fixes', 'for-next', 'omap-testing', 'cbus' and 'testing-i2c' into tmp-rebuild-
1300721502
Conflicts:
drivers/i2c/busses/i2c-omap.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff