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)

Trivial merge