summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: rtnetlink - make create_link take name_assign_typeTom Gundersen2014-07-153-7/+17
* net: set name_assign_type in alloc_netdev()Tom Gundersen2014-07-1597-133/+185
* net: set name assign type for renamed devicesTom Gundersen2014-07-151-0/+7
* net: add name_assign_type netdev attributeTom Gundersen2014-07-154-0/+39
* net: mvpp2: Fix a typo in the licenseEzequiel Garcia2014-07-151-1/+1
* Merge branch 'amd811e-cleanups'David S. Miller2014-07-141-187/+176
|\
| * ethernet: amd: fix 'foo* bar'Varka Bhadram2014-07-141-36/+40
| * ethernet: amd: fix pci device idsVarka Bhadram2014-07-141-9/+11
| * ethernet: amd: fix comment stylesVarka Bhadram2014-07-141-95/+86
| * ethernet: amd: dynamic debug fixesVarka Bhadram2014-07-141-32/+26
| * ethernet: amd: use devm_ioremap()Varka Bhadram2014-07-141-5/+2
| * ethernet: amd: move amd111e_remove_one after probeVarka Bhadram2014-07-141-12/+13
|/
* Merge branch 'sfc-next'David S. Miller2014-07-142-0/+13
|\
| * sfc: Add 40G link capability decodingEdward Cree2014-07-141-0/+11
| * sfc: Adding PCI ID for Solarflare 7000 series 40G network adapter.Mateusz Wrzesinski2014-07-141-0/+2
|/
* Merge branch 'udp_tunnel'David S. Miller2014-07-1410-226/+266
|\
| * udp: Move udp_tunnel_segment into udp_offload.cTom Herbert2014-07-142-76/+76
| * l2tp: Call udp_sock_createTom Herbert2014-07-142-59/+28
| * vxlan: Call udp_sock_createTom Herbert2014-07-142-91/+25
| * udp: Add udp_sock_create for UDP tunnels to open listener socketTom Herbert2014-07-144-0/+137
|/
* Merge branch 'unnecessary_break'David S. Miller2014-07-1311-19/+0
|\
| * slip: remove unnecessary break after gotoFabian Frederick2014-07-131-1/+0
| * rtlwifi: remove unnecessary break after gotoFabian Frederick2014-07-131-1/+0
| * wcn36xx: remove unnecessary break after gotoFabian Frederick2014-07-131-1/+0
| * orinoco_usb: remove unnecessary break after gotoFabian Frederick2014-07-131-1/+0
| * ps3_gelic: remove unnecessary break after gotoFabian Frederick2014-07-131-3/+0
| * i40evf: remove unnecessary break after gotoFabian Frederick2014-07-131-2/+0
| * i40e: remove unnecessary break after gotoFabian Frederick2014-07-131-2/+0
| * ixgbe: remove unnecessary break after gotoFabian Frederick2014-07-133-7/+0
| * igb: remove unnecessary break after gotoFabian Frederick2014-07-131-1/+0
|/
* net: filter: sk_chk_filter() no longer mangles filterEric Dumazet2014-07-132-4/+4
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-07-1345-1476/+3756
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-07-1145-1476/+3756
| |\
| | * Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-1029-1407/+3643
| | |\
| | | * Bluetooth: Don't send ERTM configuration option when disabledMarcel Holtmann2014-07-091-0/+3
| | | * Bluetooth: Fix setting HCI_CONNECTABLE from ioctl codeJohan Hedberg2014-07-093-0/+23
| | | * Bluetooth: Add white list lookup for incoming connection requestsJohan Hedberg2014-07-091-4/+12
| | | * Bluetooth: Enable page scan also if there are white list entriesJohan Hedberg2014-07-091-2/+4
| | | * Bluetooth: Refactor connection request handlingJohan Hedberg2014-07-091-52/+60
| | | * Bluetooth: Fix incorrectly setting HCI_CONNECTABLEJohan Hedberg2014-07-091-0/+8
| | | * Bluetooth: Update page scan when necessary for Add/Remove DeviceJohan Hedberg2014-07-091-0/+34
| | | * Bluetooth: Introduce a whitelist for BR/EDR devicesJohan Hedberg2014-07-093-2/+74
| | | * Bluetooth: Unify helpers for bdaddr_list manipulationsJohan Hedberg2014-07-096-96/+36
| | | * Bluetooth: Fix enabling Authenticated Payload Timeout Expired eventMarcel Holtmann2014-07-092-1/+2
| | | * Bluetooth: Add support for Acer [13D3:3432]Anantha Krishnan2014-07-082-0/+3
| | | * Bluetooth: Fix clearing HCI_LE_ADV for LE connectionsJohan Hedberg2014-07-081-0/+5
| | | * Bluetooth: Fix toggling background scan when changing connectable stateJohan Hedberg2014-07-081-1/+3
| | | * Bluetooth: Fix connectable and discoverable supported settings valuesJohan Hedberg2014-07-081-2/+2
| | | * Bluetooth: Fix setting STOPPING state for discoveryJohan Hedberg2014-07-081-7/+18
| | | * Bluetooth: Fix check for re-enabling advertisingJohan Hedberg2014-07-081-1/+1