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

Conflicts:
	net/mac80211/mlme.c

2012-07-09 16:34:34 -04:00

..

core.c

NFC: Introduce target mode tx ops

2012-06-04 21:34:30 +02:00

data.c

NFC: Quiet nci/data.c sparse noise about plain integer as NULL pointer

2012-05-15 17:30:29 -04:00

Kconfig

NFC: basic NCI protocol implementation

2011-09-20 14:43:49 -04:00

lib.c

NFC: Include nci_core.h to nci/lib.c

2012-05-15 17:30:29 -04:00

Makefile

NFC: basic NCI protocol implementation

2011-09-20 14:43:49 -04:00

ntf.c

NFC: Prevent multiple buffer overflows in NCI

2012-06-25 16:38:40 +02:00

rsp.c

NFC: NCI code identation fixes

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