From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Jan 2008 23:15:32 +0000 (+1100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v2.6.25-rc1~1128
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  asm-generic/tlb.h: build fix
  x86: uninline __pte_free_tlb() and __pmd_free_tlb()
  x86: fix small sparse warning
  x86: fix sparse warning in kernel/scx200_32.c
  x86: early_ioremap_reset fix 2
  x86: c_p_a clflush_cache_range fix
  x86: change_page_attr_clear fix
  x86: fix sparse warnings in intel_cacheinfo.c
---

fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3