John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-tx.c include/net/bluetooth/bluetooth.h		2011-11-22 14:05:46 -05:00
..
core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2011-11-22 14:05:46 -05:00
data.c	NFC: Update names and structs to NCI spec 1.0 d18	2011-11-11 12:32:50 -05:00
Kconfig	NFC: basic NCI protocol implementation	2011-09-20 14:43:49 -04:00
lib.c	NFC: Update names and structs to NCI spec 1.0 d18	2011-11-11 12:32:50 -05:00
Makefile	NFC: basic NCI protocol implementation	2011-09-20 14:43:49 -04:00
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