Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/net/wireless/rtlwifi/efuse.c drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c net/bluetooth/mgmt.c
Showing
- drivers/atm/solos-pci.c 11 additions, 28 deletionsdrivers/atm/solos-pci.c
- drivers/connector/cn_queue.c 17 additions, 41 deletionsdrivers/connector/cn_queue.c
- drivers/connector/connector.c 12 additions, 35 deletionsdrivers/connector/connector.c
- drivers/net/atlx/atl2.c 14 additions, 8 deletionsdrivers/net/atlx/atl2.c
- drivers/net/bonding/bond_alb.h 1 addition, 1 deletiondrivers/net/bonding/bond_alb.h
- drivers/net/irda/via-ircc.c 21 additions, 73 deletionsdrivers/net/irda/via-ircc.c
- drivers/net/mlx4/eq.c 3 additions, 1 deletiondrivers/net/mlx4/eq.c
- drivers/net/mlx4/mcg.c 4 additions, 3 deletionsdrivers/net/mlx4/mcg.c
- drivers/net/phy/phy_device.c 6 additions, 2 deletionsdrivers/net/phy/phy_device.c
- drivers/net/starfire.c 1 addition, 5 deletionsdrivers/net/starfire.c
- drivers/net/usb/Kconfig 15 additions, 0 deletionsdrivers/net/usb/Kconfig
- drivers/net/usb/Makefile 1 addition, 0 deletionsdrivers/net/usb/Makefile
- drivers/net/usb/cdc_eem.c 1 addition, 1 deletiondrivers/net/usb/cdc_eem.c
- drivers/net/usb/cdc_ether.c 16 additions, 7 deletionsdrivers/net/usb/cdc_ether.c
- drivers/net/usb/cdc_ncm.c 1 addition, 1 deletiondrivers/net/usb/cdc_ncm.c
- drivers/net/usb/cdc_subset.c 8 additions, 0 deletionsdrivers/net/usb/cdc_subset.c
- drivers/net/usb/gl620a.c 1 addition, 1 deletiondrivers/net/usb/gl620a.c
- drivers/net/usb/lg-vl600.c 346 additions, 0 deletionsdrivers/net/usb/lg-vl600.c
- drivers/net/usb/net1080.c 1 addition, 1 deletiondrivers/net/usb/net1080.c
- drivers/net/usb/plusb.c 1 addition, 1 deletiondrivers/net/usb/plusb.c
Loading
Please register or sign in to comment