git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c699464
1de9e8e
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Sun, 18 Jan 2009 12:08:53 +0000
(14:08 +0200)
committer
Tony Lindgren
<tony@atomide.com>
Sun, 18 Jan 2009 12:08:53 +0000
(14:08 +0200)
Merge branches 'master' and 'linus'
Conflicts:
drivers/i2c/chips/Kconfig
drivers/i2c/chips/Makefile
drivers/leds/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff