git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f69169f
99abfea
)
Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/
author
Tony Lindgren
<tony@atomide.com>
Thu, 25 Jan 2007 22:21:41 +0000
(14:21 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 25 Jan 2007 22:21:41 +0000
(14:21 -0800)
Conflicts:
drivers/mmc/omap.c
drivers/mtd/nand/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff