git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fc4e5b
3dc5063
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Wed, 23 Apr 2008 23:26:05 +0000
(16:26 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 23 Apr 2008 23:26:05 +0000
(16:26 -0700)
Merge branches 'master' and 'linus'
Conflicts:
drivers/i2c/chips/isp1301_omap.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff