diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-28 18:55:00 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-28 18:55:43 +0400 |
| commit | 97ea6d0f3eb019891038cd2dfddb749d6bf219be (patch) | |
| tree | 3b7d2f31ab27b4cd5546b0ab72bb9a0c3bdfd008 /fs/reiserfs/inode.c | |
| parent | 8a14e8bf386434732eed6678120fe52acee6244a (diff) | |
| parent | 50b78b2a6500d0e97c204c1b6c51df8c17358bbe (diff) | |
| download | linux-97ea6d0f3eb019891038cd2dfddb749d6bf219be.tar.xz | |
Merge tag 'nfc-next-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
So says Samuel Ortiz <sameo@linux.intel.com>:
The 2nd NFC pull request for 3.7.
- A couple of wrong context sleep fixes.
- An LLCP rwlock intizialisation fix.
- A missing mutex unlocking for pn533.
- LLCP raw sockets support. This is going to be used for NFC sniffing.
- A build fix for llc_shdlc. It fixes a build error triggered by code that's
living in wireless-next.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'fs/reiserfs/inode.c')
0 files changed, 0 insertions, 0 deletions