Merge tag 'keys-devel-20131210' of git://git.kernel.org/pub/scm/linux/kernel/git...