From: Michael Ellerman Date: Fri, 17 Apr 2015 01:22:51 +0000 (+1000) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood... X-Git-Tag: v4.1-rc1~13^2~6 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=1cbee462a5afc1cc30389915b3d18bdcb3c47ad6;p=karo-tx-linux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into fixes --- 1cbee462a5afc1cc30389915b3d18bdcb3c47ad6