Message ID | 20131018171456.GA14419@lukather |
---|---|
State | New |
Headers | show |
On Fri, Oct 18, 2013 at 07:14:56PM +0200, Maxime Ripard wrote: > Kevin, Olof, > > Please pull the following changes for the 3.13 merge window. > > Thanks! > Maxime > > The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f: > > Linux 3.12-rc1 (2013-09-16 16:17:51 -0400) > > are available in the git repository at: > > https://github.com/mripard/linux.git tags/sunxi-core-for-3.13 Thanks, pulled into next/soc. -Olof
On Sun, Oct 27, 2013 at 9:16 PM, Olof Johansson <olof@lixom.net> wrote: > On Fri, Oct 18, 2013 at 07:14:56PM +0200, Maxime Ripard wrote: >> Kevin, Olof, >> >> Please pull the following changes for the 3.13 merge window. >> >> Thanks! >> Maxime >> >> The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f: >> >> Linux 3.12-rc1 (2013-09-16 16:17:51 -0400) >> >> are available in the git repository at: >> >> https://github.com/mripard/linux.git tags/sunxi-core-for-3.13 > > Thanks, pulled into next/soc. This caused conflicts (and build breaks) due to the .init_time removal and thus the removal of sunxi_timer_init(). I've merged in the removal branch as a prereq and added a fixup patch on top (see separate patch email). No action needed from you on this, just cc:ing you the patch so you see it. -Olof