]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74e9160 fd04808)
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)
commit4c7145a1ec1bb789d5f07e47510e8bda546a7c4a
treee2767b77e5413473a3bba302237f4669a203f183tree | snapshot
parent74e91604b2452c15bbe72d77b37cf47ed0310d13commit | diff
parentfd048088306656824958e7783ffcee27e241b361commit | 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
Unnamed repository; edit this file 'description' to name the repository.