summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next in...John W. Linville2011-08-0317-41/+85
|\
| * iwlagn: 5000 do not support idle modeWey-Yi Guy2011-08-023-1/+5
| * rt2x00: fix usage of NULL queueStanislaw Gruszka2011-08-021-2/+3
| * rt2x00: Fix compilation without CONFIG_RT2X00_LIB_CRYPTOHelmut Schaa2011-08-021-1/+2
| * iwlagn: sysfs couldn't find the priv pointerEmmanuel Grumbach2011-08-021-9/+9
| * rt2x00: rt2800: fix zeroing skb structureStanislaw Gruszka2011-08-011-2/+1
| * rtlwifi: Fix kernel oops on ARM SOCLarry Finger2011-08-011-9/+11
| * ath9k: skip ->config_pci_powersave() if PCIe port has ASPM disabledStanislaw Gruszka2011-08-015-13/+40
| * cfg80211: off by one in nl80211_trigger_scan()Dan Carpenter2011-08-011-1/+1
| * iwlegacy: set tx power after rxon_assocStanislaw Gruszka2011-08-012-3/+11
| * ath9k: initialize tx chainmask before testing channel tx power valuesFelix Fietkau2011-08-011-0/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-07-2836-245/+358
|\ \
| * | tg3: Remove 5719 jumbo frames and TSO blocksMatt Carlson2011-07-281-3/+3
| * | tg3: Break larger frags into 4k chunks for 5719Matt Carlson2011-07-282-6/+47
| * | tg3: Add tx BD budgeting codeMatt Carlson2011-07-281-20/+29
| * | tg3: Consolidate code that calls tg3_tx_set_bd()Matt Carlson2011-07-281-37/+42
| * | tg3: Add partial fragment unmapping codeMatt Carlson2011-07-282-0/+27
| * | tg3: Generalize tg3_skb_error_unmap()Matt Carlson2011-07-281-32/+16
| * | tg3: Remove short DMA check for 1st fragmentMatt Carlson2011-07-281-3/+0
| * | tg3: Simplify tx bd assignmentsMatt Carlson2011-07-281-39/+37
| * | tg3: Reintroduce tg3_tx_ring_infoMatt Carlson2011-07-282-7/+12
| * | ASIX: Use only 11 bits of header for data sizeMarek Vasut2011-07-281-2/+2
| * | ASIX: Simplify condition in rx_fixup()Marek Vasut2011-07-281-3/+2
| * | Fix cdc-phonet buildChris Clayton2011-07-281-0/+1
| * | bonding: reduce noise during initAndy Gospodarek2011-07-281-1/+1
| * | bonding: fix string comparison errorsAndy Gospodarek2011-07-281-62/+71
| * | net: Audit drivers to identify those needing IFF_TX_SKB_SHARING clearedNeil Horman2011-07-2814-8/+22
| * | net: add IFF_SKB_TX_SHARED flag to priv_flagsNeil Horman2011-07-283-3/+8
| * | net: sock_sendmsg_nosec() is staticEric Dumazet2011-07-281-1/+1
| * | forcedeth: fix vlansJiri Pirko2011-07-281-3/+13
| * | gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3eSebastian Pöhn2011-07-281-5/+1
| * | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-07-285-7/+11
| |\ \
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-07-265-7/+11
| | |\|
| | | * wireless: fix a typo in ignore_reg_updateMihai Moldovan2011-07-261-1/+1
| | | * b43: fix invalid memory access in b43_ssb_remove()Pavel Roskin2011-07-261-2/+3
| | | * b43: bcma: drop BROKENRafał Miłecki2011-07-261-1/+1
| | | * b43: bus: fix memory corruption when setting driver's dataRafał Miłecki2011-07-261-0/+2
| | | * cfg80211: really ignore the regulatory requestSven Neumann2011-07-261-2/+3
| | | * NFC: pn533: use after free in pn533_disconnect()Dan Carpenter2011-07-261-1/+1
| * | | gro: Only reset frag0 when skb can be pulledHerbert Xu2011-07-271-1/+4
| * | | net: Convert struct net_device uc_promisc to boolJoe Perches2011-07-262-3/+3
| * | | net: fix eth.c kernel-doc warningRandy Dunlap2011-07-261-0/+1
| * | | IPv4: Send gratuitous ARP for secondary IP addresses alsoZoltan Kiss2011-07-261-8/+8
| * | | ipv6: Do not leave router anycast address for /127 prefixes.YOSHIFUJI Hideaki2011-07-261-0/+2
| * | | drivers:connector:remove an unused variable *tracer*Wanlong Gao2011-07-261-1/+0
| * | | acenic: use netdev_alloc_skb_ip_alignstephen hemminger2011-07-262-24/+27
* | | | Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds2011-07-2812-1379/+3093
|\ \ \ \
| * | | | md/raid10: handle further errors during fix_read_error better.NeilBrown2011-07-281-15/+44
| * | | | md/raid10: Handle read errors during recovery better.NeilBrown2011-07-281-33/+121
| * | | | md/raid10: simplify read error handling during recovery.NeilBrown2011-07-281-5/+4