]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7fabd12 6e42ac2)
Merge branch 'linus' into x86/spinlocks
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:39:30 +0000 (12:39 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:39:50 +0000 (12:39 +0200)
commitf39a66cc1da7b11160c5e5fc31e96d31e6b2872d
treee2767b77e5413473a3bba302237f4669a203f183tree | snapshot
parent7fabd1269a12a8f86d4efeb82e87fffe5187ee4ccommit | diff
parent6e42ac2e0be8d41a79b271628b2ee664ddeb9534commit | diff
Merge branch 'linus' into x86/spinlocks

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
Linux Kernel Source Tree.