summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-12-1819-124/+226
|\
| * Merge tag 'mac80211-for-davem-2014-12-18' of git://git.kernel.org/pub/scm/lin...David S. Miller2014-12-187-17/+32
| |\
| | * mac80211: free management frame keys when removing stationJohannes Berg2014-12-171-1/+1
| | * cfg80211: correctly check ad-hoc channelsArik Nemtsov2014-12-121-1/+7
| | * cfg80211: don't WARN about two consecutive Country IE hintEmmanuel Grumbach2014-12-121-5/+2
| | * mac80211: update the channel context after channel switchEmmanuel Grumbach2014-12-121-0/+4
| | * nl80211: check matches array length before acessing itLuciano Coelho2014-12-121-1/+1
| | * cfg80211: avoid mem leak on driver hint setArik Nemtsov2014-12-121-1/+4
| | * cfg80211: Fix 160 MHz channels with 80+80 and 160 MHz driversJouni Malinen2014-12-121-3/+6
| | * mac80211: fix multicast LED blinking and counterAndreas Müller2014-12-121-5/+6
| | * mac80211: avoid using uninitialized stack dataJes Sorensen2014-12-121-0/+1
| * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2014-12-181-5/+9
| |\ \
| | * | Bluetooth: Fix bug with filter in service discovery optimizationMarcel Holtmann2014-12-171-5/+9
| * | | geneve: Fix races between socket add and release.Jesse Gross2014-12-181-6/+7
| * | | geneve: Remove socket and offload handlers at destruction.Jesse Gross2014-12-181-0/+17
| * | | netlink: Don't reorder loads/stores before marking mmap netlink frame as avai...Thomas Graf2014-12-181-1/+1
| * | | netlink: Always copy on mmap TX.David Miller2014-12-181-36/+16
| |/ /
| * | net: Disallow providing non zero VLAN ID for NIC drivers FDB add flowOr Gerlitz2014-12-161-0/+5
| * | ip_tunnel: Add missing validation of encap type to ip_tunnel_encap_setup()Thomas Graf2014-12-161-0/+3
| * | ip_tunnel: Add sanity checks to ip_tunnel_encap_add_ops()Thomas Graf2014-12-161-0/+6
| * | Merge tag 'master-2014-12-15' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-12-166-54/+123
| |\ \
| | * \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-12-156-54/+123
| | |\ \
| | | * | Bluetooth: Fix mgmt response status when removing adapterJohan Hedberg2014-12-121-3/+15
| | | * | Bluetooth: Fix enabling BR/EDR SC when powering onJohan Hedberg2014-12-121-0/+5
| | | * | Bluetooth: Fix notifying mgmt power off before flushing connection listJohan Hedberg2014-12-111-8/+6
| | | * | Bluetooth: Fix incorrect pending cmd removal in pairing_complete()Johan Hedberg2014-12-111-13/+25
| | | * | Bluetooth: Fix calling hci_conn_put too earlyJohan Hedberg2014-12-111-2/+2
| | | * | Bluetooth: Fix check for support for page scan related commandsMarcel Holtmann2014-12-111-10/+10
| | | * | Bluetooth: Fix missing hci_dev_lock/unlock in hci_eventJaganath Kanakkassery2014-12-111-0/+20
| | | * | Bluetooth: Fix missing hci_dev_lock/unlock in mgmt req_complete()Jaganath Kanakkassery2014-12-112-6/+14
| | | * | Bluetooth: fix err_cast.cocci warningsFengguang Wu2014-12-091-1/+1
| | | * | Bluetooth: Fix generation of non-resolvable private addressesMarcel Holtmann2014-12-083-8/+20
| | | * | Bluetooth: Check for force_lesc_support before rejecting SMP over BR/EDRMarcel Holtmann2014-12-071-1/+2
| | | * | Bluetooth: Check for force_lesc_support when enabling SMP over BR/EDRMarcel Holtmann2014-12-061-2/+3
| * | | | rds: Fix min() warning in rds_message_inc_copy_to_user()Geert Uytterhoeven2014-12-151-1/+2
| * | | | gre: fix the inner mac header in nbma tunnel xmit pathTimo Teräs2014-12-151-4/+5
| |/ / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-12-176-51/+203
|\ \ \ \
| * | | | libceph: specify position of extent operationYan, Zheng2014-12-171-13/+6
| * | | | libceph: add CREATE osd operation supportYan, Zheng2014-12-171-20/+22
| * | | | libceph: add SETXATTR/CMPXATTR osd operations supportYan, Zheng2014-12-171-0/+47
| * | | | libceph: require cephx message signature by defaultYan, Zheng2014-12-171-0/+13
| * | | | libceph: message signature supportYan, Zheng2014-12-173-3/+103
| * | | | libceph: store session key in cephx authorizerYan, Zheng2014-12-172-7/+12
| * | | | libceph: nuke ceph_kvfree()Ilya Dryomov2014-12-173-11/+3
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-12-164-66/+20
|\ \ \ \ \
| * | | | | make default ->i_fop have ->open() fail with ENXIOAl Viro2014-12-103-47/+0
| * | | | | Merge branch 'nsfs' into for-nextAl Viro2014-12-101-19/+20
| |\ \ \ \ \
| | * | | | | bury struct proc_ns in fs/procAl Viro2014-12-041-3/+1
| | * | | | | copy address of proc_ns_ops into ns_commonAl Viro2014-12-041-2/+7
| | * | | | | new helpers: ns_alloc_inum/ns_free_inumAl Viro2014-12-041-2/+2