git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
69575d3
326ba50
)
Merge commit 'v2.6.31-rc8' into x86/txt
author
Ingo Molnar
<mingo@elte.hu>
Wed, 2 Sep 2009 06:17:56 +0000
(08:17 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 2 Sep 2009 06:17:56 +0000
(08:17 +0200)
Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig
Merge reason: resolve the conflicts, bump up from rc3 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge