git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
40b8606
2e532d6
)
Merge commit 'linus/master' into merge-linus
author
Arjan van de Ven
<arjan@linux.intel.com>
Fri, 17 Oct 2008 16:20:26 +0000
(09:20 -0700)
committer
Arjan van de Ven
<arjan@linux.intel.com>
Fri, 17 Oct 2008 16:20:26 +0000
(09:20 -0700)
Conflicts:
arch/x86/kvm/i8254.c
Trivial merge