tree c7a58e677723699b1ea5da09ba7a47a06a42cce2
parent 655861e328cea83320190f4a57b3656ee952388c
parent dc5efaa049cbb10efaf47fe977d45ea1e38b4465
author Linus Torvalds <torvalds@linux-foundation.org> 1335918245 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1335918245 -0700

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/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()