summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-04-2511-55/+64
|\
| * netfilter: nf_nat: missing condition in nf_xfrm_me_harder()Dan Carpenter2013-04-251-0/+1
| * ipvs: Use network byte order for sync message sizeSimon Horman2013-04-231-13/+8
| * ipvs: off by one in set_sctp_state()Dan Carpenter2013-04-231-1/+1
| * ipvs: Use min3() in ip_vs_dbg_callid()Simon Horman2013-04-231-1/+2
| * ipvs: Avoid shadowing net variable in ip_vs_leave()Simon Horman2013-04-231-2/+2
| * ipvs: fix sparse warnings for some parametersJulian Anastasov2013-04-234-23/+32
| * ipvs: fix sparse warnings in lblc and lblcrJulian Anastasov2013-04-232-2/+2
| * ipvs: fix the remaining sparse warnings in ip_vs_ctl.cJulian Anastasov2013-04-231-4/+6
| * ipvs: fix sparse warnings for ip_vs_conn listingJulian Anastasov2013-04-231-8/+6
| * ipvs: properly dereference dest_dst in ip_vs_forget_devJulian Anastasov2013-04-231-1/+4
* | Merge branch 'qlcnic'David S. Miller2013-04-246-61/+277
|\ \
| * | qlcnic: Update version to 5.2.42Shahed Shaikh2013-04-241-2/+2
| * | qlcnic: Add identifying string for 83xx adapterHimanshu Madhani2013-04-241-19/+106
| * | qlcnic: Rename the IRQ description.Himanshu Madhani2013-04-242-9/+18
| * | qlcnic: Enable Interrupt Coalescing for 83xx adapterHimanshu Madhani2013-04-244-22/+87
| * | qlcnic: Add eSwitch statistics supportShahed Shaikh2013-04-243-1/+11
| * | qlcnic: Take EPORT out of reset sequence before disabling PAUSEManish Chopra2013-04-241-0/+25
| * | qlcnic: Enhance channel configuration logsManish Chopra2013-04-243-8/+28
|/ /
* | Merge branch 'bnx2x'David S. Miller2013-04-246-28/+59
|\ \
| * | bnx2x: Allow recovery from second slot resetYuval Mintz2013-04-241-0/+1
| * | bnx2x: Fix memory leakYuval Mintz2013-04-242-3/+3
| * | bnx2x: Enhance MAC configuration for VFsDmitry Kravkov2013-04-244-15/+30
| * | bnx2x: Allow RX/TX pause control in autonegYaniv Rosner2013-04-242-5/+14
| * | bnx2x: prevent GRO false checksum claimsYuval Mintz2013-04-241-5/+11
|/ /
* | Merge branch 'mlx4'David S. Miller2013-04-2418-20/+507
|\ \
| * | net/mlx4_en: Add a service taskAmir Vadai2013-04-243-0/+47
| * | net/mlx4_en: Support software timestampingAmir Vadai2013-04-241-0/+2
| * | net/mlx4_en: Add HW timestamping (TS) supportAmir Vadai2013-04-2415-17/+375
| * | net/mlx4_core: Read HCA frequency and map internal clockEugenia Emantayev2013-04-245-1/+75
| * | net/mlx4_core: Add timestamping device capabilityEugenia Emantayev2013-04-242-2/+8
|/ /
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2013-04-24257-5629/+9897
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-24257-5629/+9897
| |\ \
| | * | mwifiex: rework round robin scheduling of bss nodes.Andreas Fenkart2013-04-233-77/+29
| | * | mwifiex: replace ra_list_curr by list rotation.Andreas Fenkart2013-04-234-69/+40
| | * | brcmfmac: add credit borrowing mechanismArend van Spriel2013-04-231-8/+87
| | * | brcmfmac: correct error handling in brcmf_fws_init()Arend van Spriel2013-04-232-9/+24
| | * | brcmfmac: flush queue upon MACDESC_DEL firmware signalArend van Spriel2013-04-231-2/+3
| | * | brcmfmac: support critical protocol API for DHCPPiotr Haber2013-04-235-1/+576
| | * | brcmfmac: allow scanning to be suppressed in the driverArend van Spriel2013-04-232-1/+13
| | * | ath9k: Fix RX DMA mappingSujith Manoharan2013-04-231-3/+3
| | * | ath9k: Use lockless variants for the RX fifo queueSujith Manoharan2013-04-231-2/+2
| | * | ath9k: Reduce deep indentationSujith Manoharan2013-04-231-46/+44
| | * | ath9k: Remove unused argument "size"Sujith Manoharan2013-04-231-9/+3
| | * | ath9k: add support for the new rate control APIFelix Fietkau2013-04-233-8/+19
| | * | ath9k: merge ath_tx_start_dma into ath_tx_startFelix Fietkau2013-04-231-44/+36
| | * | rtl8192c:dm: Properly initialize local array and set value.Han Shen2013-04-231-2/+2
| | * | ath9k: apply coverage class on slottime tooMathias Kretschmer2013-04-231-1/+2
| | * | Merge branch 'master' of git://git.infradead.org/users/rafal/b43-nextJohn W. Linville2013-04-239-442/+661
| | |\ \
| | | * | b43: N-PHY: don't use deprecated b43_radio_foo16Rafał Miłecki2013-04-231-59/+59
OpenPOWER on IntegriCloud