Merge branch 'v3.20-clk/new-ids' into v3.20-clk/next
authorHeiko Stuebner <heiko@sntech.de>
Thu, 22 Jan 2015 14:41:06 +0000 (15:41 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Thu, 22 Jan 2015 14:41:06 +0000 (15:41 +0100)

Trivial merge