iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4b7cc7fc26
linux/net/bluetooth
History
David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/netfilter/nfnetlink_log.c
	net/netfilter/xt_LOG.c

Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.

Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-15 11:43:53 -04:00
..
bnep Bluetooth: Added /proc/net/bnep via bt_procfs_init() 2012-08-06 15:02:59 -03:00
cmtp Bluetooth: Added /proc/net/cmtp via bt_procfs_init() 2012-08-06 15:02:59 -03:00
hidp Bluetooth: Added /proc/net/hidp via bt_procfs_init() 2012-08-06 15:02:59 -03:00
rfcomm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-08-22 14:21:38 -07:00
a2mp.c Bluetooth: Free the l2cap channel list only when refcount is zero 2012-08-06 15:02:58 -03:00
af_bluetooth.c Bluetooth: /proc/net/ entries for bluetooth protocols 2012-08-06 15:02:58 -03:00
hci_conn.c Bluetooth: Fix sending a HCI Authorization Request over LE links 2012-08-27 08:11:51 -07:00
hci_core.c Bluetooth: mgmt: Managing only BR/EDR HCI controllers 2012-08-06 15:02:54 -03:00
hci_event.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-08-22 14:21:38 -07:00
hci_sock.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-08-22 14:21:38 -07:00
hci_sysfs.c Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
Kconfig Bluetooth: Fix Kconfig help description 2012-02-29 18:50:25 +02:00
l2cap_core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
l2cap_sock.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
lib.c Bluetooth: Remove unnecessary headers include 2012-06-05 06:34:08 +03:00
Makefile Bluetooth: A2MP: Create A2MP channel 2012-06-05 06:34:11 +03:00
mgmt.c Bluetooth: Use lmp_ssp_capable where applicable 2012-08-06 15:02:56 -03:00
sco.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-08-22 14:21:38 -07:00
smp.c Bluetooth: Change signature of smp_conn_security() 2012-08-27 08:07:18 -07:00