commit | f8016f1eac1ff7162130f253a41099386558ebc1 | [log] [tgz] |
---|---|---|
author | Arnd Bergmann <arnd@arndb.de> | Tue Mar 19 22:59:54 2013 +0100 |
committer | Arnd Bergmann <arnd@arndb.de> | Tue Mar 19 22:59:54 2013 +0100 |
tree | ef0dc6e802f7d168e746688fd4c4f3c331e8ba3b | |
parent | 5fa2f9af76f780a54f59579e1e71f1e85a9b6c64 [diff] | |
parent | 4d10f054f7df600ec8a388091c93b2d976920de0 [diff] |
Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform