Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
12b03188ab
linux/net/nfc
History
David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-30 03:55:20 -04:00
..
hci NFC: Initial Secure Element API 2013-01-10 00:51:54 +01:00
nci NFC: Initial Secure Element API 2013-01-10 00:51:54 +01:00
af_nfc.c NFC: Core code identation fixes 2012-03-06 15:16:25 -05:00
core.c NFC: RFKILL support 2013-04-12 16:54:45 +02:00
Kconfig NFC: Add missing RFKILL dependency for Kconfig 2013-04-27 01:02:46 +02:00
llcp_commands.c NFC: Move LLCP code to the NFC top level diirectory 2013-04-26 12:37:28 +02:00
llcp_core.c NFC: Move LLCP code to the NFC top level diirectory 2013-04-26 12:37:28 +02:00
llcp_sock.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04:00
llcp.h NFC: Move LLCP code to the NFC top level diirectory 2013-04-26 12:37:28 +02:00
Makefile NFC: Move LLCP code to the NFC top level diirectory 2013-04-26 12:37:28 +02:00
netlink.c NFC: Move LLCP code to the NFC top level diirectory 2013-04-26 12:37:28 +02:00
nfc.h NFC: Move LLCP code to the NFC top level diirectory 2013-04-26 12:37:28 +02:00
rawsock.c NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00