]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 9 Jun 2014 22:44:21 +0000 (00:44 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 9 Jun 2014 22:44:21 +0000 (00:44 +0200)
commitb372bf0a06e9521f3102acc3290b5e980638d615
tree4fa5fc3cecb03136bddfeffd69de7e60381a1e66
parent5366c855e0d8646bcdb5a6e5286cbf300688859f
parent9815594a780404810c2a6280de1a268dcfcb0729
parent7eb6e340526adf14ed7cf7dfde8b9c6fc0741cfc
Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next

Conflicts:
scripts/Makefile.host (trivial context conflict)
Makefile
scripts/Makefile.host
scripts/kconfig/Makefile