Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel...