diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-08-26 13:37:15 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-08-26 15:39:51 -0400 |
| commit | f991975a9a3ac64c9df1767b45d84e6af3944d57 (patch) | |
| tree | 3c2c9b6b74be16aa0304589c759f9a1fa59d8de0 /net/nfc/llcp_sock.c | |
| parent | e0c7cbcada84aa70709673b0d0fba0ca5d11cb01 (diff) | |
| parent | 0b8e8118dd2c9440bb7a2da1a19e15e324d3c09b (diff) | |
Merge tag 'v3.12.25' into v3.12-rt
This is the 3.12.25 stable release
Conflicts:
kernel/rtmutex.c
Diffstat (limited to 'net/nfc/llcp_sock.c')
0 files changed, 0 insertions, 0 deletions