John W. Linville 87bc0728d4 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h		2013-11-04 14:51:28 -05:00
..
core.c	Bluetooth: Access HIDP session addresses through L2CAP channel	2013-10-13 20:00:33 +03:00
hidp.h	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
Kconfig	HID: Fix the generic Kconfig options	2012-06-25 17:25:00 +02:00
Makefile
sock.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00