git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
256cea8
b69d398
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Fri, 25 Apr 2008 18:49:52 +0000
(11:49 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 25 Apr 2008 18:49:52 +0000
(11:49 -0700)
Merge branches 'master' and 'linus'
Conflicts:
sound/soc/Kconfig
sound/soc/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff