| commit | 24dfb2b5867df24ba03b6c4418312e23b1300aa8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 14 13:03:24 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 14 13:03:24 2009 -0800 |
| tree | c6381a80ee04eb253121ccfd49d05af7559c0041 | |
| parent | cd4ca27d3dedfff09000586e4ae67771608696a0 [diff] | |
| parent | 5df9d11be46a9f704208644a1e7f13c6104ecff2 [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: SMTC: Fix lockup in smtc_distribute_timer MIPS: TXx9: Update rbtx49xx_defconfig MIPS: Make local arrays with CL_SIZE static __initdata MIPS: Add DMA declare coherent memory support MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs.