git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31400bb 8f45b11)
Merge branch 'renesas-soc-core' into renesas-soc
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:01:33 +0000 (23:01 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:01:33 +0000 (23:01 +0200)
* renesas-soc-core:
  ARM: shmobile: soc-core: add R-mobile PM domain common APIs
  ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
  ARM: shmobile: add common DMAEngine definitions
  ARM: shmobile: add common extra gpio functions

Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c


Trivial merge
Pandora Kernel Repository