| commit | d5cd8605e2814d268cddee1ff1d95d9010b4e8eb | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri May 23 22:59:20 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri May 23 23:02:30 2014 +0200 |
| tree | 87f67a177b10ec6c9e6c023cabb1c3607efe20b5 | |
| parent | 21c27cabe69bdce92130364efe5d945323b37986 [diff] | |
| parent | 138e8f1c4e99cd349e50fd8b18aebbd2716ceb87 [diff] |
Merge branch 'at91/cleanup' into next/dt Conflicts: arch/arm/boot/dts/at91sam9rl.dtsi Needed as a dependency for the at91/dt2 branch Signed-off-by: Arnd Bergmann <arnd@arndb.de>