projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 082b63a 0c23590)
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2009 22:49:10 +0000 (15:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jun 2009 22:49:10 +0000 (15:49 -0700)
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, 64-bit: ifdef out struct thread_struct::ip
  x86, 32-bit: ifdef out struct thread_struct::fs
  x86: clean up alternative.h

1  2 
arch/x86/include/asm/processor.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/kgdb.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/processor.h
Simple merge
diff --cc arch/x86/kernel/kgdb.c
Simple merge
John Crispins staging tree