John W. Linville 635d999fd3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	net/mac80211/mlme.c

2012-07-09 16:34:34 -04:00

..

commands.c

NFC: LLCP's MIUX is 10 bytes long, not 7

2012-06-04 21:34:29 +02:00

Kconfig

…

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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2012-07-09 16:34:34 -04:00