From: Ingo Molnar Date: Sun, 12 Oct 2008 10:39:30 +0000 (+0200) Subject: Merge branch 'linus' into x86/spinlocks X-Git-Tag: v2.6.28-rc1~699^2^2^3 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4c7145a1ec1bb789d5f07e47510e8bda546a7c4a;p=linux-2.6-omap-h63xx.git 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 --- 4c7145a1ec1bb789d5f07e47510e8bda546a7c4a