Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 10:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
3872baf618
linux/net/nfc
History
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
hci NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00
llcp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-25 12:49:17 -05:00
nci NFC: Remove CONFIG_EXPERIMENTAL from the NCI Makefile 2012-10-26 18:26:53 +02:00
af_nfc.c NFC: Core code identation fixes 2012-03-06 15:16:25 -05:00
core.c NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00
Kconfig NFC: Remove CONFIG_EXPERIMENTAL 2012-10-26 18:26:52 +02:00
Makefile NFC: HCI support 2012-04-12 15:10:34 -04:00
netlink.c NFC: Extend netlink interface for LTO, RW, and MIUX parameters support 2012-10-29 00:25:11 +01:00
nfc.h NFC: Extend netlink interface for LTO, RW, and MIUX parameters support 2012-10-29 00:25:11 +01:00
rawsock.c NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00