git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
426d310
f6cec0a
)
Merge branch 'master' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 10 Aug 2010 11:22:08 +0000
(13:22 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 10 Aug 2010 11:22:08 +0000
(13:22 +0200)
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff