Merge branch 'docs-3.4' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2012 02:27:26 +0000 (19:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2012 02:27:26 +0000 (19:27 -0700)
commit9c687702b66a24ddd688fcabf765be9e72219808
treeb3e9b82faf33be96a02f7d75db7e338109b5d839
parent82b769063598d01a8b24abf250a53f8b437e09f1
parenta05a4830a32ef9f89e7bd372a7bae9b96b1ac266
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