From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 13:41:54 +0000 (+0100)
Subject: Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc
X-Git-Tag: v3.15-rc1~79^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=780d2bf3d07db0c88860a6c8e4e551cfe07f780d;p=pandora-kernel.git

Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc

Merge "Allwinner core additions for 3.15" from Maxime Ripard:

Just a minor commit to adjust the restart code to take into account the new
compatibles

* tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux:
  ARM: sunxi: Add the new watchog compatibles to the reboot code

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

780d2bf3d07db0c88860a6c8e4e551cfe07f780d
Reading git-diff-tree failed