John W. Linville 49c87cd1ea Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	net/nfc/llcp/llcp.c

2013-03-18 09:39:21 -04:00

..

hci

NFC: Initial Secure Element API

2013-01-10 00:51:54 +01:00

llcp

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-03-18 09:39:21 -04:00

nci

NFC: Initial Secure Element API

2013-01-10 00:51:54 +01:00

af_nfc.c

NFC: Core code identation fixes

2012-03-06 15:16:25 -05:00

core.c

Driver core patches for 3.9-rc1

2013-02-21 12:05:51 -08:00

Kconfig

NFC: Remove CONFIG_EXPERIMENTAL

2012-10-26 18:26:52 +02:00

Makefile

NFC: HCI support

2012-04-12 15:10:34 -04:00

netlink.c

NFC: llcp: Service Name Lookup netlink interface

2013-03-10 23:14:54 +01:00

nfc.h

NFC: llcp: Service Name Lookup netlink interface

2013-03-10 23:14:54 +01:00

rawsock.c

NFC: Fix some code style and whitespace issues

2012-10-26 18:26:52 +02:00