From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Nov 2008 21:13:48 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c93fc2873edcd3eae0ed11ba288a77f3ef62e92b;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.
  MIPS: csrc-r4k: Fix spelling mistake.
  MIPS: RB532: Provide functions for gpio configuration
  MIPS: IP22: Make indy_sc_ops variable static
  MIPS: RB532: GPIO register offsets are relative to GPIOBASE
  MIPS: Malta: Fix include paths in malta-amon.c
---

c93fc2873edcd3eae0ed11ba288a77f3ef62e92b