diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:02:50 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:02:50 +0100 |
commit | 1646df40bb111715a90ce0b86448dabbcc5b3f3d (patch) | |
tree | 2545ab36faca45629afb45d997e1c6a107176555 /fs/inode.c | |
parent | writeback: double the dirty thresholds (diff) | |
parent | MIPS: R2: Fix problem with code that incorrectly modifies ebase. (diff) | |
download | linux-1646df40bb111715a90ce0b86448dabbcc5b3f3d.tar.xz linux-1646df40bb111715a90ce0b86448dabbcc5b3f3d.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: R2: Fix problem with code that incorrectly modifies ebase.
MIPS: Change {set,clear,change}_c0_<foo> to return old value.
MIPS: compat: Remove duplicated #include
MIPS: VR5500: Enable prefetch
MIPS: Fix oops in dma_unmap_page on not coherent mips platforms
Diffstat (limited to 'fs/inode.c')
0 files changed, 0 insertions, 0 deletions