tree 0c3f8a6b4d5d911a86a1c4c9362935a3b4b13107
parent ed79b86d8acf1f3d3bb83f04dc216c8dfa1d5970
parent 20a4a236c7de5c915551cdc562482aa53eaff40e
author Linus Torvalds <torvalds@linux-foundation.org> 1227215372 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1227215372 -0800

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: uaccess_64: fix return value in __copy_from_user()
  x86: quirk for reboot stalls on a Dell Optiplex 330