| commit | e770a0f1154193ca6b6e720a86aeaa2edc9261c6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 02 12:45:33 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 02 12:45:33 2010 -0800 |
| tree | 04f5f5420e4116a18be8f94c117aadb870eaa46d | |
| parent | 7ab02af428c2d312c0cf8fb0b01cc1eb21131a3d [diff] | |
| parent | 91dfc423cc8cfd399fb308a837102a7ab7fa067e [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: 64-bit: Detect virtual memory size MIPS: AR7: Fix USB slave mem range typo MIPS: Alchemy: Fix dbdma ring destruction memory debugcheck.