]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
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