git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1cc4fff
3c92ec8
)
Merge branch 'linus' into timers/hrtimers
author
Ingo Molnar
<mingo@elte.hu>
Mon, 29 Dec 2008 08:42:58 +0000
(09:42 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 29 Dec 2008 09:37:07 +0000
(10:37 +0100)
Conflicts:
sound/drivers/pcsp/pcsp.c
Semantic conflict:
sound/core/hrtimer.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff