Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...