Merge tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:33:19 +0000 (23:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:49:22 +0000 (23:49 +0200)
commit40b0f135efdd185685ea9c84c5717224aaee72d1
tree00dd56099eefea1560a4d3dba7cef533520919af
parent4078679ecf93979adff211dd4a840d0956f2aa9f
parentde9bd52f21b5677a18a205c2a931c87254dabdeb
Merge tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm into for-next

Merge "mach-bcm dt updates for 3.16" from Matt Porter:

* Add PWM support to bcm281xx and bcm28155 ap board
* Add gpldo and vbus regulators to bcm590xx

* tag 'for-3.16/bcm-dt' of git://github.com/broadcom/mach-bcm:
  ARM: dts: bcm590xx: add support for GPLDO and VBUS regulators
  ARM: dts: Enable the PWM for bcm28155 AP board
  ARM: dts: Declare the PWM for bcm11351 (bcm281xx)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>