git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4c168ea
24342c3
)
Merge commit 'v2.6.27-rc5' into tip/oprofile
author
Robert Richter
<robert.richter@amd.com>
Wed, 24 Sep 2008 09:25:31 +0000
(11:25 +0200)
committer
Robert Richter
<robert.richter@amd.com>
Wed, 24 Sep 2008 09:25:31 +0000
(11:25 +0200)
Conflicts:
arch/x86/oprofile/nmi_int.c
Trivial merge