Message ID | cover.1427243965.git.horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
On Wed, Mar 25, 2015 at 09:43:26AM +0900, Simon Horman wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > Please consider these third round of Renesas ARM based SoC cleanup for v4.1. > > > This pull requests has minor conflict with "Renesas ARM Based SoC sh7372 > SoC Removal Updates for v4.1", tagged as > renesas-sh7372-soc-removal-for-v4.1, which you have already pulled. > > The solution is to remove arch/arm/mach-shmobile/pm-sh7372.c. > > > The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539: > > Linux 4.0-rc1 (2015-02-22 18:21:14 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-cleanup3-for-v4.1 Merged, thanks. -Olof