diff options
author | 2009-03-02 15:47:01 -0800 | |
---|---|---|
committer | 2009-03-02 15:47:01 -0800 | |
commit | 2d44947a56f7a567f2e9250dc458a6288d774f9c (patch) | |
tree | 9156958b53ef544b314c9af708f43a6e425dfc72 /fs/squashfs/cache.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | fix warning in io_mapping_map_wc() (diff) | |
download | linux-dev-2d44947a56f7a567f2e9250dc458a6288d774f9c.tar.xz linux-dev-2d44947a56f7a567f2e9250dc458a6288d774f9c.zip |
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()
Diffstat (limited to 'fs/squashfs/cache.c')
0 files changed, 0 insertions, 0 deletions