Merge branch 'renesas-mackerel' into renesas-board
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:07:57 +0000 (23:07 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:07:57 +0000 (23:07 +0200)
commitcfc073bafb93dc18c9a09de195841b7a7a32a8e2
tree475e3504cf669512e15e7ad540a73cdafbb2fed8
parentf193b42fa22b2ec578088e52d50d31e4a56631b7
parent70ccb28deaacc4a0b15ade4baf18170f3082301c
Merge branch 'renesas-mackerel' into renesas-board

* renesas-mackerel:
  ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerel
  ARM: shmobile: use common extra gpio functions on Mackerel
arch/arm/mach-shmobile/board-mackerel.c