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
..
a2mp.h	Bluetooth: A2MP: Manage incoming connections	2012-06-05 06:34:14 +03:00
bluetooth.h	Bluetooth: /proc/net/ entries for bluetooth protocols	2012-08-06 15:02:58 -03:00
hci.h	Bluetooth: Fix hci_le_conn_complete_evt	2012-08-06 15:05:10 -03:00
hci_core.h	Bluetooth: Make connect / disconnect cfm functions return void	2012-08-06 15:02:58 -03:00
hci_mon.h	Bluetooth: Fix coding style in all .h files	2012-03-07 00:04:25 -03:00
l2cap.h	Bluetooth: Free the l2cap channel list only when refcount is zero	2012-08-06 15:02:58 -03:00
mgmt.h	Bluetooth: Fix flags of mgmt_device_found event	2012-06-12 23:19:21 -03:00
rfcomm.h	Bluetooth: rfcomm: Fix sleep in invalid context in rfcomm_security_cfm	2011-11-07 17:24:49 -02:00
sco.h	Bluetooth: clean up legal text	2010-12-01 21:04:43 -02:00
smp.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00