diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 14:02:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 14:02:50 -0400 |
| commit | 1646df40bb111715a90ce0b86448dabbcc5b3f3d (patch) | |
| tree | 2545ab36faca45629afb45d997e1c6a107176555 /drivers/memstick | |
| parent | 1b5e62b42b55c509eea04c3c0f25e42c8b35b564 (diff) | |
| parent | 9fb4c2b9e06c0a197d867b34865b113a47370bd5 (diff) | |
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 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions