diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 19:27:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 19:27:26 -0700 |
| commit | 9c687702b66a24ddd688fcabf765be9e72219808 (patch) | |
| tree | b3e9b82faf33be96a02f7d75db7e338109b5d839 /kernel/trace/trace_output.c | |
| parent | 82b769063598d01a8b24abf250a53f8b437e09f1 (diff) | |
| parent | a05a4830a32ef9f89e7bd372a7bae9b96b1ac266 (diff) | |
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
Diffstat (limited to 'kernel/trace/trace_output.c')
0 files changed, 0 insertions, 0 deletions