| commit | a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 06 19:32:21 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 06 19:32:21 2008 -0700 |
| tree | 799e60e111e2f5179c7ffd81483abd1d2397003b | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 [diff] | |
| parent | 0011036beeffeada15acd1936d67988de21ca65e [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] Probe initrd header only if explicitly specified [MIPS] TX39xx: Add missing local_flush_icache_range initialization [MIPS] TXx9: Fix txx9_pcode initialization [MIPS] Fix WARNING: at kernel/smp.c:290 [MIPS] Fix data bus error recovery