aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2015-03-24 17:38:14 +0100
committerMichal Marek <mmarek@suse.cz>2015-03-24 17:38:14 +0100
commit4ee14ab5a132d856bcd5d0f6ee1c8236d74eee81 (patch)
tree29260688d26b073afcc81a4dc77fed4549aec61e /Makefile
parent94100b52d1c03cded6564f0939780ae39805e07e (diff)
parent4218affdf57f938c04e3a916a9685ee27079f377 (diff)
parent63a91033d52e64a22e571fe84924c0b7f21c280d (diff)
Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next