| commit | e9144754867b9ef431d54ea2a156f78feb196c34 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 08 12:40:19 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 08 12:40:19 2008 -0700 |
| tree | ae440455e4daeaeeb3552ca5e8a826e6821632d4 | |
| parent | eb35c218d83ec0780d9db869310f2e333f628702 [diff] | |
| parent | 14defd90f5281da8a1bf43bc789efbafe5991cd8 [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] Fix 32bit kernels on R4k with 128 byte cache line size [MIPS] Atlas, decstation: Fix section mismatches triggered by defconfigs