John W. Linville e11c259f74 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: include/net/bluetooth/bluetooth.h		2011-11-17 13:11:43 -05:00
..
core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
data.c	NFC: Update names and structs to NCI spec 1.0 d18	2011-11-11 12:32:50 -05:00
Kconfig
lib.c	NFC: Update names and structs to NCI spec 1.0 d18	2011-11-11 12:32:50 -05:00
Makefile
ntf.c	NFC: Removal of unused operations for NCI spec 1.0 d18	2011-11-11 12:32:50 -05:00
rsp.c	NFC: Removal of unused operations for NCI spec 1.0 d18	2011-11-11 12:32:50 -05:00