Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jan 2008 23:15:32 +0000 (10:15 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jan 2008 23:15:32 +0000 (10:15 +1100)
commitfcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3
tree050a81468f8644cfb0f3c07a140456c136301a30
parente95035c61a4c3dae1aa543a5bf5b39846daca061
parent62152d0ea7012382cd814c7b361b4ef2029f26e6
Merge git://git./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