From: Linus Torvalds Date: Sat, 28 Apr 2012 02:27:26 +0000 (-0700) Subject: Merge branch 'docs-3.4' of git://git.samba.org/jlayton/linux X-Git-Tag: v3.4-rc5~21 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9c687702b66a24ddd688fcabf765be9e72219808;p=~emulex%2Finfiniband.git Merge branch 'docs-3.4' of git://git.samba.org/jlayton/linux Pull security key doc update from Jeff Layton: "Ordinarily, I send my patches through others' trees, but David suggested I just send this one to you directly since it's just a Documentation/ update" * 'docs-3.4' of git://git.samba.org/jlayton/linux: keys: update the documentation with info about "logon" keys --- 9c687702b66a24ddd688fcabf765be9e72219808