]> err.no Git - linux-2.6/commit
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 18:37:19 +0000 (11:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 18:37:19 +0000 (11:37 -0700)
commit97055a915720fe1aff9ac71c17fae60e929d4ed6
treed0ee48805cbec19b760a2ce9702bf3c3bc8bb8ce
parentee3ece830f6db9837f7ac67008f532a8c1e755f4
parent8986d2f50e1a9ba63f64ccbf59181886aa7898c3
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] cevt-txx9: Reset timer counter on initialization
  [MIPS] IP22: Fix crashes due to wrong L1_CACHE_BYTES
  [MIPS] IP32: Fix unexpected irq 71