tree 87ab31efc0cb0d7009dc39abd9f569bcfb387260
parent ba8f318471f66d5d5b79da68112525cf432b2b18
parent 7ca0758cdb7c241cb4e0490a8d95f0eb5b861daf
author Linus Torvalds <torvalds@linux-foundation.org> 1314148148 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314148148 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-32, vdso: On system call restart after SYSENTER, use int $0x80
  x86, UV: Remove UV delay in starting slave cpus
  x86, olpc: Wait for last byte of EC command to be accepted