From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 May 2012 00:24:05 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.4-rc6~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=208d501708c4397898fc440ac8cc68537538e39e;p=profile%2Fcommon%2Fkernel-common.git

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

Pull MIPS fixes from Ralf Baechle:
 "misc fixes some of which are also applicable to 3.3 and removal of an
  unused function.  This has been sitting in -next for ages with no
  complaints.  Also there are no known regressions due to these patches"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Remove get_current_pgd().
  MIPS: ath79: fix AR933X WMAC reset code
  MIPS: JZ4740: Fix the JZ4740_IRQ_DMA macro
  MIPS: Use set_current_blocked() and block_sigmask()
---

208d501708c4397898fc440ac8cc68537538e39e