]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commitaa98936e4f423dc2706771368598b04870059d14
tree5b503225ee28f4b9648354db54eb29f4c097c140
parent082b63ae45e7d14e15995dedd782ec7344596fb2
parent0c23590f00f85467b318ad0c20c36796a5bd4c60
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* '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
arch/x86/include/asm/processor.h
arch/x86/kernel/kgdb.c