projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7f274d 8db21ad)
Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:41:54 +0000 (14:41 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:41:54 +0000 (14:41 +0100)
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>

Trivial merge