Merge branch 'renesas-ap4evb' into renesas-board
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:07:05 +0000 (23:07 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:07:05 +0000 (23:07 +0200)
commit5ae794735c96f7be21a49c4e57fb8579174132be
tree40943996be636bde6875b7988760ba1a5c644013
parentb315ec06e0590ca0aa60a856420d6b698ab896b1
parent8778b8f46a7c567fc5b19b0eb4a47f51e5064e3c
Merge branch 'renesas-ap4evb' into renesas-board

* renesas-ap4evb:
  ARM: mach-shmobile: add fixed voltage regulators to ap4evb
  ARM: shmobile: use common extra gpio functions on ap4evb
arch/arm/mach-shmobile/board-ap4evb.c