From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Sep 2008 15:31:52 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.27-rc8~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4;p=linux-2.6-omap-h63xx.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:
  [SSB] Initialise dma_mask for SSB_BUSTYPE_SSB devices
  [MIPS] BCM47xx: Fix build error due to missing PCI functions
  [MIPS] IP27: Switch to dynamic interrupt routing avoding panic on error.
  [MIPS] au1000: Make sure GPIO value is zero or one
---

0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4