From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Aug 2013 20:14:43 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.11-rc5~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1853a65ec5bd07c18f4a43e6709486c81400afa6;p=karo-tx-linux.git

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS fixes from Ralf Baechle:
 "Two platform-specific fixes plus a fix for oprofile which was calling
  smp_processor_id() in preemptible code"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: BMIPS: fix hardware interrupt routing for boot CPU != 0
  MIPS: oprofile: Fix BUG due to smp_processor_id() in preemptible code.
  MIPS: PNX833x: PNX8335_PCI_ETHERNET_INT depends on CONFIG_SOC_PNX8335
---

1853a65ec5bd07c18f4a43e6709486c81400afa6