Merge tag 'v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into next-test