]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 2 Apr 2015 15:24:51 +0000 (17:24 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 2 Apr 2015 15:24:51 +0000 (17:24 +0200)
commit9925d001cdf83189f0dc8cc69e5e31efb911307c
treed9acea4184b5b7a4d67b6e95ab163fe4274af21b
parent0bb623a630e00f4a1b47ad9f886689c2583ab281
parentd4a4e3f5a3e8bcd8aa778120d5f902b06a0e1019
Merge branch 'kbuild/kbuild' into kbuild/for-next

Conflicts:
Makefile
Makefile