]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 3 Jan 2014 17:11:43 +0000 (18:11 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 3 Jan 2014 17:11:43 +0000 (18:11 +0100)

Trivial merge