git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ed1065
da8cadb
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Sun, 16 Dec 2007 00:08:15 +0000
(16:08 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Sun, 16 Dec 2007 00:08:15 +0000
(16:08 -0800)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/kernel/entry-armv.S
drivers/i2c/busses/i2c-omap.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff