| commit | 780d2bf3d07db0c88860a6c8e4e551cfe07f780d | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 17 14:41:54 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Mar 17 14:41:54 2014 +0100 |
| tree | 7516792b2fb75305ebb0458c22a1e7cbb6a73324 | |
| parent | e7f274dccf7f18a58b86aa8cbd269cdfbdb08056 [diff] | |
| parent | 8db21ad469fda194913db2c5b11635bcc21345fc [diff] |
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>