From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Mar 2009 23:47:01 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2d44947a56f7a567f2e9250dc458a6288d774f9c;p=linux-2.6-omap-h63xx.git

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:
  fix warning in io_mapping_map_wc()
  x86: i915 needs pgprot_writecombine() and is_io_mapping_possible()
---

2d44947a56f7a567f2e9250dc458a6288d774f9c