]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 05:25:39 +0000 (21:25 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 15 Jan 2008 05:25:39 +0000 (21:25 -0800)
commitc60ecec67ab3f6b5791ef49d502b7a61909aa13e
treee8180ad2ec48a6063277ee51cf10dc8541dcac2f
parentc23f72cae9523d29ff94eec8f30ccbdaf234b20e
parent2e4f95822cc17cb7095d50babe2d2fc4c043fa25
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] Cacheops.h: Fix typo.
  [MIPS] Cobalt: Qube1 has no serial port so don't use it
  [MIPS] Cobalt: Fix ethernet interrupts for RaQ1
  [MIPS] Kconfig fixes for BCM47XX platform