From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2008 19:03:36 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux... 
X-Git-Tag: v2.6.26-rc1~1073
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd0e101d630b0d7ed6c9e1ccf7af7fc91818330e;p=linux-2.6-omap-h63xx.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-x86-fixes4:
  x86: harden kernel code patching
  x86: clean up text_poke()
  x86: fix text_poke()
  x86: remove set_fixmap() warning
  x86: make __set_fixmap() non-init
  x86: make clear_fixmap() available on 64-bit as well
---

dd0e101d630b0d7ed6c9e1ccf7af7fc91818330e