git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5db2e3b
9bf1a24
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 17 Nov 2008 18:19:19 +0000
(10:19 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 17 Nov 2008 18:19:19 +0000
(10:19 -0800)
Merge branches 'master' and 'linus'
Conflicts:
drivers/w1/masters/omap_hdq.c
drivers/w1/slaves/Kconfig
drivers/w1/slaves/w1_bq27000.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff