OSDN Git Service

Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Mar 2013 21:59:54 +0000 (22:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Mar 2013 21:59:54 +0000 (22:59 +0100)
commitf8016f1eac1ff7162130f253a41099386558ebc1
treeef0dc6e802f7d168e746688fd4c4f3c331e8ba3b
parent5fa2f9af76f780a54f59579e1e71f1e85a9b6c64
parent4d10f054f7df600ec8a388091c93b2d976920de0
Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform