From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 7 Mar 2008 18:05:57 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux... 
X-Git-Tag: v2.6.25-rc5~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0a9e0703497013cf7a21455e51face5f048a187f;p=linux-2.6-omap-h63xx.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86-boot: don't request VBE2 information
  x86: re-add reboot fixups
  x86: fix typo in step.c
  x86: fix merge mistake in i387.c
  x86: clear DF before calling signal handler
---

0a9e0703497013cf7a21455e51face5f048a187f