Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable