| commit | 4c7145a1ec1bb789d5f07e47510e8bda546a7c4a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 12:39:30 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 12:39:50 2008 +0200 |
| tree | e2767b77e5413473a3bba302237f4669a203f183 | |
| parent | 74e91604b2452c15bbe72d77b37cf47ed0310d13 [diff] | |
| parent | fd048088306656824958e7783ffcee27e241b361 [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