OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
08b5d06
660e34c
0c61227
)
Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 20 May 2011 01:09:45 +0000
(18:09 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 20 May 2011 01:09:45 +0000
(18:09 -0700)
* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Reorder reboot method preferences
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, setup: Fix EDD3.0 data verification.
Trivial merge