summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ros...Linus Torvalds2010-10-291-7/+36
|\
| * kconfig: Have streamline_config process menuconfigs tooSteven Rostedt2010-10-291-2/+2
| * kconfig: Fix streamline_config to read multi line deps in Kconfig filesSteven Rostedt2010-10-291-1/+18
| * kconfig: Fix missing declaration of variable $dir in streamline_config.plhiromu2010-10-291-1/+3
| * kconfig: Fix variable name typo %prompts in streamline_config.plhiromu yagura2010-10-291-2/+2
| * kconfig: Make localmodconfig handle environment variablesSteven Rostedt2010-10-291-1/+11
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-10-2949-246/+525
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-10-2911-38/+102
| |\ \
| | * | b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmdLarry Finger2010-10-291-0/+2
| | * | mac80211: fix failure to check kmalloc return value in key_key_readJesper Juhl2010-10-291-1/+5
| | * | libertas: Fix sd8686 firmware reloadPaul Fox2010-10-291-3/+29
| | * | ath9k: Fix incorrect access of rate flags in RCMohammed Shafi Shajakhan2010-10-291-1/+1
| | * | ath5k: Fix double free on hw attach error pathJones Desougi2010-10-271-9/+8
| | * | mac80211: Fix scan_ies_len to include DS ParamsJouni Malinen2010-10-271-2/+3
| | * | ath9k_htc: Set proper firmware offset for Netgear WNDA3200Rajkumar Manoharan2010-10-271-2/+8
| | * | ath9k: fix tx aggregation flush on AR9003Felix Fietkau2010-10-271-9/+9
| | * | ath9k: lock reset and PCU start/stoppingLuis R. Rodriguez2010-10-272-2/+27
| | * | ath9k: rename rxflushlock to pcu_lockLuis R. Rodriguez2010-10-273-6/+6
| | * | ath9k: add locking for starting the PCU on RXLuis R. Rodriguez2010-10-271-3/+4
| | * | ath9k: add locking for stopping RXLuis R. Rodriguez2010-10-271-2/+2
| * | | netfilter: xt_socket: Make tproto signed in socket_mt6_v1().David S. Miller2010-10-281-4/+3
| * | | stmmac: enable/disable rx/tx in the core with a single write.avisconti2010-10-281-30/+10
| * | | net: atarilance - flags should be unsigned longGeert Uytterhoeven2010-10-281-1/+1
| * | | netxen: fix kdumpRajesh Borundia2010-10-282-15/+7
| * | | pktgen: Limit how much data we copy onto the stack.Nelson Elhage2010-10-281-3/+4
| * | | net: Limit socket I/O iovec total length to INT_MAX.David S. Miller2010-10-283-16/+16
| * | | USB: gadget: fix ethernet gadget crash in gether_setupDmitry Artamonow2010-10-281-1/+1
| * | | fib: Fix fib zone and its hash leak on namespace stopPavel Emelyanov2010-10-284-1/+26
| * | | cxgb3: Fix panic in free_tx_desc()Krishna Kumar2010-10-281-1/+3
| * | | cxgb3: fix crash due to manipulating queues before registrationNishanth Aravamudan2010-10-281-1/+1
| * | | 8390: Don't oops on starting dev queuePavel Emelyanov2010-10-281-1/+0
| * | | dccp ccid-2: Stop pollingGerrit Renker2010-10-282-8/+20
| * | | dccp: Refine the wait-for-ccid mechanismGerrit Renker2010-10-284-54/+89
| * | | dccp: Extend CCID packet dequeueing interfaceGerrit Renker2010-10-283-58/+89
| * | | dccp: Return-value convention of hc_tx_send_packet()Gerrit Renker2010-10-282-9/+37
| * | | igbvf: fix panic on loadEmil Tantilov2010-10-281-4/+4
| * | | ixgb: call pci_disable_device in ixgb_removeEmil Tantilov2010-10-281-0/+1
| * | | ixgbe: DCB, fix TX hang occurring in stress condition with PFCJohn Fastabend2010-10-285-10/+54
| * | | e1000e: Add check for reset flags before displaying reset messageCarolyn Wyborny2010-10-281-2/+5
| * | | e1000e: reset PHY after errors detectedCarolyn Wyborny2010-10-283-0/+63
| * | | pch_gbe: Select MII.David S. Miller2010-10-281-0/+1
| * | | igb: Fix unused variable warning.Jesse Gross2010-10-271-1/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2010-10-2993-39835/+0
|\ \ \ \
| * | | | Staging: dream: remove dream driver and arch from treeGreg Kroah-Hartman2010-10-2993-39835/+0
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecr...Linus Torvalds2010-10-295-12/+55
|\ \ \ \ \
| * | | | | eCryptfs: Print mount_auth_tok_only param in ecryptfs_show_optionsTyler Hicks2010-10-291-0/+2
| * | | | | ecryptfs: added ecryptfs_mount_auth_tok_only mount parameterRoberto Sassu2010-10-293-1/+17
| * | | | | ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig()Roberto Sassu2010-10-291-2/+2
| * | | | | ecryptfs: release keys loaded in ecryptfs_keyring_auth_tok_for_sig()Roberto Sassu2010-10-291-6/+28
| * | | | | eCryptfs: Clear LOOKUP_OPEN flag when creating lower fileTyler Hicks2010-10-291-0/+4