]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'v4.6-shared/pdids' into v4.6-armsoc/drivers
authorHeiko Stuebner <heiko@sntech.de>
Mon, 25 Jan 2016 14:15:05 +0000 (15:15 +0100)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 25 Jan 2016 14:15:05 +0000 (15:15 +0100)

Trivial merge