From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 20 Feb 2007 01:38:33 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.21-rc1~56
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1ca949299260aa49eeba34ff912e2321c8b1f647;p=~shefty%2Frdma-dev.git

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] Cobalt: Fix UART I/O type
  [MIPS] Fixup copy_from_user_inatomic
  [MIPS] Fix struct sigcontext for N32 userland
  [MIPS] Make some __setup functions static
  [MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
  [MIPS] Allow selection of KGDB only on platforms where it's supported.
---

1ca949299260aa49eeba34ff912e2321c8b1f647