projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
74e9160
fd04808
)
Merge branch 'linus' into x86/spinlocks
author
Ingo Molnar
<mingo@elte.hu>
Sun, 12 Oct 2008 10:39:30 +0000
(12:39 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 12 Oct 2008 10:39:50 +0000
(12:39 +0200)
Done to prevent this failure of an Octopus merge:
Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff