linux-sg2042/net/nfc
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
..
nci 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
Kconfig NFC: basic NCI protocol implementation 2011-09-20 14:43:49 -04:00
Makefile NFC: basic NCI protocol implementation 2011-09-20 14:43:49 -04:00
af_nfc.c net: Fix files explicitly needing to include module.h 2011-10-31 19:30:28 -04:00
core.c NFC: Add dev_up and dev_down control operations 2011-09-20 14:43:49 -04:00
netlink.c NFC: Add dev_up and dev_down control operations 2011-09-20 14:43:49 -04:00
nfc.h treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00
rawsock.c net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04:00