projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be71b85
15d4fcd
)
Merge branch 'x86/defconfig' into x86/mce2
author
H. Peter Anvin
<hpa@zytor.com>
Tue, 24 Feb 2009 23:59:14 +0000
(15:59 -0800)
committer
H. Peter Anvin
<hpa@zytor.com>
Wed, 25 Feb 2009 00:01:17 +0000
(16:01 -0800)
Conflicts (resolved):
arch/x86/configs/x86_64_defconfig
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff