]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'v3.20-clk/new-ids' into v3.20-armsoc/dts
authorHeiko Stuebner <heiko@sntech.de>
Wed, 28 Jan 2015 09:59:44 +0000 (10:59 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Wed, 28 Jan 2015 09:59:44 +0000 (10:59 +0100)

Trivial merge