David S. Miller
5f013c9bc7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces. These were simple transformations from
netlink_capable to netlink_ns_capable.
The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
..
ath3k.c
Bluetooth: Add support for Lite-on [04ca:3007]
2014-04-25 09:47:16 +03:00
bcm203x.c
bfusb.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
bluecard_cs.c
Bluetooth: bluecard: Use del_timer_sync() in teardown path
2014-03-23 10:30:22 -07:00
bpa10x.c
Bluetooth: Declare bpa10x_table[] as const
2013-10-11 17:05:22 +02:00
bt3c_cs.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
btmrvl_debugfs.c
btmrvl_drv.h
Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd()
2014-04-24 11:55:25 -03:00
btmrvl_main.c
Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd()
2014-04-24 11:55:25 -03:00
btmrvl_sdio.c
Bluetooth: btmrvl: implement read-to-clear for SD8897 interrupts
2014-03-28 19:37:06 -07:00
btmrvl_sdio.h
Bluetooth: btmrvl: implement read-to-clear for SD8897 interrupts
2014-03-28 19:37:06 -07:00
btsdio.c
Bluetooth: Use MD SET register for changing SDIO Type-B to Type-A
2013-12-29 21:31:07 +02:00
btuart_cs.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
btusb.c
Bluetooth: Add support for Lite-on [04ca:3007]
2014-04-25 09:47:16 +03:00
btwilink.c
Bluetooth: Add hdev parameter to hdev->send driver callback
2013-10-11 15:28:03 +02:00
dtl1_cs.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
hci_ath.c
hci_bcsp.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
hci_h4.c
Bluetooth: Remove hci_h4 unused defines
2014-04-24 11:55:26 -03:00
hci_h5.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
hci_ldisc.c
Bluetooth: Remove assignments in if-statements
2014-03-05 20:52:17 +02:00
hci_ll.c
Bluetooth: Add hdev parameter to hdev->send driver callback
2013-10-11 15:28:03 +02:00
hci_uart.h
hci_vhci.c
Bluetooth: allocate static minor for vhci
2014-02-18 09:49:04 -08:00
Kconfig
Bluetooth: add module name for btwilink
2014-03-10 14:11:02 +01:00
Makefile