From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Dec 2013 17:53:59 +0000 (-0800)
Subject: Merge tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v3.13-rc3~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=da1965d353c7266fce4fe6c658f2096c88a8bebc;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull pin control fixes from Linus Walleij:

 - Minor bug fixes for the Rockchip, ST-Ericsson abx500, Renesas PFC
   r8a7740 and sh7372.

 - Compilation warning fixes.

* tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  sh-pfc: sh7372: Fix pin bias setup
  sh-pfc: r8a7740: Fix pin bias setup
  pinctrl: abx500: Fix header file include guard
  pinctrl: rockchip: missing unlock on error in rockchip_set_pull()
  pinctrl: abx500: fix some more bitwise AND tests
  pinctrl: rockchip: testing the wrong variable
---

da1965d353c7266fce4fe6c658f2096c88a8bebc