You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		13 years ago
..
nci	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	13 years ago
Kconfig	NFC: basic NCI protocol implementation	14 years ago
Makefile	NFC: basic NCI protocol implementation	14 years ago
af_nfc.c	net: Fix files explicitly needing to include module.h	13 years ago
core.c	NFC: Add dev_up and dev_down control operations	14 years ago
netlink.c	NFC: Add dev_up and dev_down control operations	14 years ago
nfc.h	treewide: use __printf not __attribute__((format(printf,...)))	13 years ago
rawsock.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	13 years ago