You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds f8965467f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits) qlcnic: adding co maintainer ixgbe: add support for active DA cables ixgbe: dcb, do not tag tc_prio_control frames ixgbe: fix ixgbe_tx_is_paused logic ixgbe: always enable vlan strip/insert when DCB is enabled ixgbe: remove some redundant code in setting FCoE FIP filter ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp ixgbe: fix header len when unsplit packet overflows to data buffer ipv6: Never schedule DAD timer on dead address ipv6: Use POSTDAD state ipv6: Use state_lock to protect ifa state ipv6: Replace inet6_ifaddr->dead with state cxgb4: notify upper drivers if the device is already up when they load cxgb4: keep interrupts available when the ports are brought down cxgb4: fix initial addition of MAC address cnic: Return SPQ credit to bnx2x after ring setup and shutdown. cnic: Convert cnic_local_flags to atomic ops. can: Fix SJA1000 command register writes on SMP systems bridge: fix build for CONFIG_SYSFS disabled ARCNET: Limit com20020 PCI ID matches for SOHARD cards ... Fix up various conflicts with pcmcia tree drivers/net/ {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and wireless/orinoco/spectrum_cs.c} and feature removal (Documentation/feature-removal-schedule.txt). Also fix a non-content conflict due to pm_qos_requirement getting renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c		15 years ago
..
Kconfig	Bluetooth: Add DFU driver for Atheros Bluetooth chipset AR3011	15 years ago
Makefile	Bluetooth: Add DFU driver for Atheros Bluetooth chipset AR3011	15 years ago
ath3k.c	Bluetooth: Add missing kfree() on error path in Atheros driver	15 years ago
bcm203x.c	Bluetooth: Make USB device id constant	15 years ago
bfusb.c	Bluetooth: Convert controller hdev->type to hdev->bus	15 years ago
bluecard_cs.c	pcmcia: dev_node removal (write-only drivers)	15 years ago
bpa10x.c	Bluetooth: Convert controller hdev->type to hdev->bus	15 years ago
bt3c_cs.c	pcmcia: dev_node removal (write-only drivers)	15 years ago
btmrvl_debugfs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
btmrvl_drv.h	Bluetooth: Set hdev->dev_type based on Marvell device type	15 years ago
btmrvl_main.c	Bluetooth: Set hdev->dev_type based on Marvell device type	15 years ago
btmrvl_sdio.c	Bluetooth: Separate btmrvl_register_hdev() from btmrvl_add_card()	15 years ago
btmrvl_sdio.h	…
btsdio.c	Bluetooth: Convert controller hdev->type to hdev->bus	15 years ago
btuart_cs.c	pcmcia: dev_node removal (write-only drivers)	15 years ago
btusb.c	Bluetooth: Convert controller hdev->type to hdev->bus	15 years ago
dtl1_cs.c	pcmcia: dev_node removal (write-only drivers)	15 years ago
hci_bcsp.c	…
hci_h4.c	Bluetooth: Fix return value when bt_skb_alloc fails	15 years ago
hci_ldisc.c	Bluetooth: Convert controller hdev->type to hdev->bus	15 years ago
hci_ll.c	Bluetooth: Use the proper function cast to get hdr data	15 years ago
hci_uart.h	…
hci_vhci.c	Bluetooth: Fix wrong packet type count increment	15 years ago