Merge branch 'v4.6-shared/clkids' into v4.6-armsoc/dts32
authorHeiko Stuebner <heiko@sntech.de>
Tue, 26 Jan 2016 00:08:42 +0000 (01:08 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Tue, 26 Jan 2016 00:08:42 +0000 (01:08 +0100)

Trivial merge