2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
linux-next/net/nfc/llcp
David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-12 21:59:18 -07:00
..
commands.c NFC: LLCP's MIUX is 10 bytes long, not 7 2012-06-04 21:34:29 +02:00
Kconfig NFC: Initial LLCP support 2011-12-14 14:50:13 -05:00
llcp.c NFC: Destroy LLCP timout workqueue when releasing the link 2012-06-04 21:34:33 +02:00
llcp.h NFC: Move LLCP MIU extension value to socket structure 2012-06-04 21:34:29 +02:00
sock.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00