]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Mar 2009 23:47:01 +0000 (15:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Mar 2009 23:47:01 +0000 (15:47 -0800)
commit2d44947a56f7a567f2e9250dc458a6288d774f9c
tree9156958b53ef544b314c9af708f43a6e425dfc72
parent359aa09be9b2b343e01306cb4a6f29d7159d7498
parent5ce04e3de8c36ba37c56e94e3c4dc7973c7f546c
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()