Merge branch 'kbuild/rc-fixes' into kbuild/for-next
Merge branch 'kbuild/misc' into kbuild/for-next
Merge branch 'kbuild/packaging' into kbuild/for-next
Merge branch 'kbuild/kconfig' into kbuild/for-next
Merge branch 'misc' into for-next
Merge branch 'kbuild' into for-next
Merge branch 'rc-fixes' into for-next
Merge branch 'rc-fixes' into for-next
Merge branches 'kbuild/rc-fixes', 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next
Merge branch 'rc-fixes' into for-next
Merge branch 'kbuild/kbuild' into kbuild/for-next

Conflicts:
	Makefile
Merge branch 'misc' into for-next
Merge branch 'misc' into for-next
Merge branch 'kbuild' into for-next
Merge branch 'rc-fixes' into for-next
Merge branch 'kconfig' into for-next
kbuild: Fix path to scripts/setlocalversion

Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Merge branch 'rc-fixes' into for-next
Merge branch 'kconfig' into for-next
Merge branch 'misc' into for-next