[GIT,PULL] Allwinner sunXi core additions for 3.12, take 2

Submitted by Maxime Ripard on Aug. 20, 2013, 7:59 a.m.

Details

Message ID 20130820075929.GA11906@lukather
State New
Headers show

Pull-request

https://github.com/mripard/linux.git tags/sunxi-core-for-3.12-2

Commit Message

Maxime Ripard Aug. 20, 2013, 7:59 a.m.
The following changes since commit 29d3d373e2a780b6e818f296ece6cc29742bc11f:

  ARM: sunxi: Remove Makefile.boot file (2013-07-29 13:55:41 +0200)

are available in the git repository at:

  https://github.com/mripard/linux.git tags/sunxi-core-for-3.12-2

for you to fetch changes up to d18fd9445b18c4adf56cfc58c378c702c8edd0da:

  ARM: sunxi: Introduce Allwinner A20 support (2013-08-16 23:23:41 +0200)

----------------------------------------------------------------
Allwinner sunXi core additions for 3.12, take 2

These patches add machine support for the Allwinner A20 and A31 SoCs

----------------------------------------------------------------
Maxime Ripard (3):
      ARM: sunxi: Add the Allwinner A31 compatible to the machine definition
      ARM: sun6i: Add restart code for the A31
      ARM: sunxi: Introduce Allwinner A20 support

 .../watchdog/{sun4i-wdt.txt => sunxi-wdt.txt}      |  5 ++-
 arch/arm/mach-sunxi/Kconfig                        |  2 +
 arch/arm/mach-sunxi/sunxi.c                        | 45 ++++++++++++++++++++--
 3 files changed, 47 insertions(+), 5 deletions(-)
 rename Documentation/devicetree/bindings/watchdog/{sun4i-wdt.txt => sunxi-wdt.txt} (56%)

Comments

Kevin Hilman Aug. 21, 2013, 11:34 p.m.
Maxime Ripard <maxime.ripard@free-electrons.com> writes:

> The following changes since commit 29d3d373e2a780b6e818f296ece6cc29742bc11f:
>
>   ARM: sunxi: Remove Makefile.boot file (2013-07-29 13:55:41 +0200)
>
> are available in the git repository at:
>
>   https://github.com/mripard/linux.git tags/sunxi-core-for-3.12-2
>
> for you to fetch changes up to d18fd9445b18c4adf56cfc58c378c702c8edd0da:
>
>   ARM: sunxi: Introduce Allwinner A20 support (2013-08-16 23:23:41 +0200)
>
> ----------------------------------------------------------------
> Allwinner sunXi core additions for 3.12, take 2
>
> These patches add machine support for the Allwinner A20 and A31 SoCs
>
> ----------------------------------------------------------------

Pulled into next/soc

In the future, when you do a 'take 2', it would be good to be specific
in the pull request about whether you want this to replace the original,
or you want it on top of the original.

It was pretty obvious in this case that the 2nd tag was based on top of
the first, but it's best to be be more detailed in the pull request to
avoid us assuming.

Thanks,

Kevin