Merge branch 'renesas-soc-core' into renesas-r8a7740
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 30 Jun 2012 13:04:01 +0000 (15:04 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sat, 30 Jun 2012 13:04:01 +0000 (15:04 +0200)
commitb379c48a31018ef3c902f4a0f8c420bbd4caa14c
tree5a809e1e4abc0c8a0147345d2f6ea06dd98f7825
parent147d1ffdc21d067f0084f0911dbf1eee57e3d76b
parent5ca1d44f6a99b29ab164a06f4ec71950d6939fb5
Merge branch 'renesas-soc-core' into renesas-r8a7740

* renesas-soc-core:
  ARM: shmobile: add common DMAEngine definitions
  ARM: shmobile: add common extra gpio functions