aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1343-391/+428
|\
| * ctcm: rename READ/WRITE defines to avoid redefinitionsUrsula Braun2010-08-125-110/+118
| * claw: rename READ/WRITE defines to avoid redefinitionsHeiko Carstens2010-08-122-61/+61
| * phylib: available for any speed ethernetRandy Dunlap2010-08-112-2/+2
| * can: add limit for nframes and clean up signed/unsigned variablesOliver Hartkopp2010-08-111-14/+27
| * pkt_sched: Check .walk and .leaf class handlersJarek Poplawski2010-08-111-1/+1
| * pkt_sched: Fix sch_sfq vs tc_modify_qdisc oopsJarek Poplawski2010-08-111-0/+6
| * caif-spi: Bugfix SPI_DATA_POS settings were inverted.Sjur Braendeland2010-08-101-2/+2
| * caif: Bugfix - Increase default headroom size for control channel.Sjur Braendeland2010-08-101-1/+1
| * net: make netpoll_rx return bool for !CONFIG_NETPOLLJohn W. Linville2010-08-101-1/+1
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-1016-144/+102
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...John W. Linville2010-08-102-8/+7
| | |\
| | | * Bluetooth: Use 3-DH5 payload size for default ERTM max PDU sizeMat Martineau2010-08-101-1/+1
| | | * Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTMMat Martineau2010-08-101-2/+0
| | | * Bluetooth: Change default L2CAP ERTM retransmit timeoutMat Martineau2010-08-101-1/+1
| | | * Bluetooth: Fix endianness issue with L2CAP MPS configurationMat Martineau2010-08-101-4/+5
| | * | iwlagn: fix rts cts protectionJohannes Berg2010-08-0911-133/+87
| | * | cfg80211: fix locking in action frame TXJohannes Berg2010-08-091-1/+7
| | * | libertas: fix build break by including linux/sched.hJohn W. Linville2010-08-091-0/+1
| | * | Revert "p54pci: Add PCI ID for SMC2802W"John W. Linville2010-08-091-2/+0
| | |/
| * | net: Use NET_XMIT_SUCCESS where possible.Ben Greear2010-08-104-6/+6
| * | isdn: mISDN: call pci_disable_device() if pci_probe() failedKulikov Vasiliy2010-08-101-1/+4
| * | isdn: avm: call pci_disable_device() if pci_probe() failedKulikov Vasiliy2010-08-101-0/+1
| * | isdn: avm: call pci_disable_device() if pci_probe() failedKulikov Vasiliy2010-08-101-0/+1
| * | usbnet: rx_submit() should return an error code.David S. Miller2010-08-101-6/+16
| * | pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add...Jarek Poplawski2010-08-101-5/+17
| * | pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: a...Jarek Poplawski2010-08-101-0/+6
| * | qlcnic: using too much stackDan Carpenter2010-08-101-6/+21
| * | qlcnic: clean up qlcnic_init_pci_info()Dan Carpenter2010-08-101-22/+23
| * | phy.c: fix kernel-doc warningsRandy Dunlap2010-08-101-1/+1
| * | net/sock.h: add missing kernel-doc notationRandy Dunlap2010-08-101-1/+3
| * | etherdevice.h: fix kernel-doc typoRandy Dunlap2010-08-101-1/+1
| * | farsync: Fix compile warnings.David S. Miller2010-08-101-7/+8
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2010-08-1313-51/+409
|\ \
| * | [NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is setSteve French2010-08-121-0/+1
| * | AFS: Implement an autocell mount capability [ver #2]wanglei2010-08-117-46/+250
| * | DNS: If the DNS server returns an error, allow that to be cached [ver #2]Wang Lei2010-08-113-5/+96
| * | NFS: Use kernel DNS resolver [ver #2]Bryan Schumaker2010-08-113-0/+52
| * | cifs: update README to include details about 'fsc' optionSuresh Jayaraman2010-08-111-0/+10
* | | Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/ti...Linus Torvalds2010-08-134-109/+154
|\ \ \
| * | | x86, asm: Use a lower case name for the end macro in atomic64_386_32.SLuca Barbieri2010-08-121-18/+20
| * | | x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleanerLuca Barbieri2010-08-111-108/+128
| * | | x86: Document __phys_reloc_hide() usage in __pa_symbol()Namhyung Kim2010-08-111-0/+7
| * | | x86, apic: Map the local apic when parsing the MP table.Eric W. Biederman2010-08-052-1/+17
* | | | x86: don't send SIGBUS for kernel page faultsLinus Torvalds2010-08-131-1/+3
* | | | mm: fix missing page table unmap for stack guard page failure caseLinus Torvalds2010-08-131-1/+3
* | | | mm: keep a guard page below a grow-down stack segmentLinus Torvalds2010-08-121-0/+23
* | | | Revert "fsnotify: store struct file not struct path"Linus Torvalds2010-08-129-76/+61
* | | | Merge branch 'io_remap_pfn_range' of git://www.jni.nu/crisLinus Torvalds2010-08-121-0/+3
|\ \ \ \
| * | | | CRIS: Define io_remap_pfn_range as remap_pfn_rangeJesper Nilsson2010-08-121-0/+3