summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-08-05 18:05:39 +0200
committerMichal Marek <mmarek@suse.cz>2014-08-05 18:05:39 +0200
commit3caa1b280fa5adbf054e02feb105dfa724ce5016 (patch)
tree5deaf20b62e835eb8f0f2fc38bfad29c3473ee8c /scripts
parent9586848e26c7b2bd6aa7f0e0a370f5777ac3f447 (diff)
parentaa8dbeee5ee012e1ee595dd1df9be04e161a3fd4 (diff)
parent26ea6bb1fef06c686be771903ecab0518af5c2de (diff)
downloadlinux-next-3caa1b280fa5adbf054e02feb105dfa724ce5016.tar.gz
Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next