commit | ea8df8c5e609a53f4d03d133baea9561412f4303 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Apr 20 22:57:51 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Apr 20 22:57:51 2007 -0700 |
tree | 1451390f27ffad89c11671eb3e61d66f48dca00b | |
parent | 241c39b9ac4bf847013aa06cce6d4d61426a2006 [diff] | |
parent | 1d464c26b5625215c4b35fb336c8f3c57d248c2e [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 wrong checksum for split TCP packets on 64-bit MIPS [MIPS] Fix BUG(), BUG_ON() handling [MIPS] Retry {save,restore}_fp_context if failed in atomic context. [MIPS] Disallow CpU exception in kernel again. [MIPS] Add missing silicon revisions for BCM112x