summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* can: c_can: add hwinit support for non-TI devicesPavel Machek2014-05-192-4/+38
* can: c_can: Add and make use of 32-bit accesses functionsPavel Machek2014-05-194-10/+60
* can: c_can: make {read,write}_reg functions constPavel Machek2014-05-193-13/+13
* can: pch_can: Fix Kconfig dependenciesJean Delvare2014-05-191-1/+1
* can: mscan: Fix Kconfig dependenciesJean Delvare2014-05-191-1/+1
* can: at91_can: Fix Kconfig dependenciesJean Delvare2014-05-191-1/+1
* can: mcp251x: fix coccinelle warningsDan Carpenter2014-05-191-1/+1
* Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2014-05-195-5/+26
|\
| * batman-adv: Start new development cycleSimon Wunderlich2014-05-181-1/+1
| * batman-adv: remove semi-colon after macro definitionAntonio Quartulli2014-05-182-4/+4
| * batman-adv: add blank line between declarations and the rest of the codeAntonio Quartulli2014-05-184-0/+21
* | net: ethernet: ibm: ehea: ehea_qmr.c: Fix for possible null pointer dereferenceRickard Strandqvist2014-05-191-1/+3
* | net: rds: Use time_after() for time comparisonManuel Schölling2014-05-192-4/+4
* | net: 8390: use time_after() for time comparisonManuel Schölling2014-05-191-2/+2
* | net/mlx4_en: Fix uninitialized use of 'port_up' in mlx4_en_set_channels()Christian Engelmayer2014-05-191-1/+1
* | ipv4: minor spelling fixstephen hemminger2014-05-191-1/+1
* | bridge: fix spelling of promiscuousstephen hemminger2014-05-191-1/+1
* | net: bridge: fix buildAlexei Starovoitov2014-05-191-1/+1
|/
* Merge branch 'cdc_ncm-coalesce'David S. Miller2014-05-174-187/+455
|\
| * net: cdc_ncm: do not start timer on an empty skbBjørn Mork2014-05-171-2/+2
| * net: cdc_ncm: remove redundant "disconnected" flagBjørn Mork2014-05-173-31/+2
| * net: cdc_ncm: fix argument alignmentBjørn Mork2014-05-171-6/+6
| * net: cdc_ncm: use sane defaults for rx/tx buffersBjørn Mork2014-05-172-2/+14
| * net: cdc_ncm/cdc_mbim: adding NCM protocol statisticsBjørn Mork2014-05-173-0/+108
| * net: cdc_ncm: set reasonable padding limitsBjørn Mork2014-05-172-2/+7
| * net: cdc_ncm: use true max dgram count for header estimatesBjørn Mork2014-05-172-12/+7
| * net: cdc_ncm: use ethtool to tune coalescing settingsBjørn Mork2014-05-172-3/+74
| * net: cdc_ncm: support rx_max/tx_max updates when runningBjørn Mork2014-05-171-6/+25
| * net: cdc_ncm: split .bind device initializationBjørn Mork2014-05-171-17/+19
| * net: cdc_ncm: factor out one-time device initializationBjørn Mork2014-05-171-96/+155
| * net: cdc_ncm: split out rx_max/tx_max update of setupBjørn Mork2014-05-171-31/+57
|/
* pktgen: Use seq_puts() where seq_printf() is not neededThomas Graf2014-05-161-25/+25
* Merge branch 'ieee802154-next'David S. Miller2014-05-1616-33/+2670
|\
| * ieee802154, mac802154: implement devkey record optionPhoebe Buckheister2014-05-162-0/+39
| * ieee802154: add netlink interfaces for llsecPhoebe Buckheister2014-05-165-0/+893
| * mac802154: propagate device address changes to llsecPhoebe Buckheister2014-05-162-3/+47
| * mac802154: add llsec configuration functionsPhoebe Buckheister2014-05-164-0/+274
| * ieee802154: add dgram sockopts for security controlPhoebe Buckheister2014-05-162-1/+75
| * mac802154: integrate llsec with wpan devicesPhoebe Buckheister2014-05-163-28/+103
| * mac802154: add llsec decryption methodPhoebe Buckheister2014-05-162-0/+248
| * mac802154: add llsec encryption methodPhoebe Buckheister2014-05-162-0/+255
| * mac802154: add llsec structures and mutatorsPhoebe Buckheister2014-05-164-1/+637
| * mac802154: update KconfigPhoebe Buckheister2014-05-161-0/+4
| * ieee802154: add types for link-layer securityPhoebe Buckheister2014-05-161-0/+95
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2014-05-1611-184/+176
|\
| * net/openvswitch: Use with RCU_INIT_POINTER(x, NULL) in vport-gre.cMonam Agarwal2014-05-161-1/+1
| * openvswitch: Use TCP flags in the flow key for stats.Jarno Rajahalme2014-05-161-7/+5
| * openvswitch: Fix output of SCTP mask.Jarno Rajahalme2014-05-161-4/+4
| * openvswitch: Per NUMA node flow stats.Jarno Rajahalme2014-05-164-55/+122
| * openvswitch: Remove 5-tuple optimization.Jarno Rajahalme2014-05-167-113/+32