]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 241c39b 1d464c2)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 21 Apr 2007 05:57:51 +0000 (22:57 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 21 Apr 2007 05:57:51 +0000 (22:57 -0700)
commitea8df8c5e609a53f4d03d133baea9561412f4303
tree1451390f27ffad89c11671eb3e61d66f48dca00btree | snapshot
parent241c39b9ac4bf847013aa06cce6d4d61426a2006commit | diff
parent1d464c26b5625215c4b35fb336c8f3c57d248c2ecommit | 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
Linux 2.6 source tree