summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJames Morris2008-11-068756-197537/+652318
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-0411-32/+64
| |\
| | * xfrm: Fix xfrm_policy_gc_lock handling.Alexey Dobriyan2008-11-041-2/+2
| | * niu: Use pci_ioremap_bar().David S. Miller2008-11-041-5/+1
| | * bnx2x: Version UpdateEilon Greenstein2008-11-041-2/+2
| | * bnx2x: Calling netif_carrier_off at the end of the probeEilon Greenstein2008-11-041-2/+2
| | * bnx2x: PCI configuration bug on big-endianEilon Greenstein2008-11-041-4/+5
| | * bnx2x: Removing the PMF indication when unloadingEilon Greenstein2008-11-041-0/+2
| | * mv643xx_eth: fix SMI bus access timeoutsLennert Buytenhek2008-11-031-3/+6
| | * net: kconfig cleanupJeff Kirsher2008-11-031-3/+15
| | * fs_enet: fix pollingAlexey Dobriyan2008-11-031-2/+4
| | * XFRM: copy_to_user_kmaddress() reports local address twiceArnaud Ebalard2008-11-031-1/+1
| | * SMC91x: Fix compilation on some platforms.David S. Miller2008-11-031-0/+2
| | * udp: Fix the SNMP counter of UDP_MIB_INERRORSWei Yongjun2008-11-031-2/+8
| | * udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMSWei Yongjun2008-11-031-5/+13
| | * drivers/net/smc911x.c: Fix lockdep warning on xmit.Will Newton2008-11-021-1/+1
| * | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-11-046-34/+58
| |\ \
| | * | libata: mask off DET when restoring SControl for detachTejun Heo2008-11-041-1/+1
| | * | libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply itTejun Heo2008-11-042-1/+5
| | * | libata: Fix a potential race condition in ata_scsi_park_show()Elias Oltmanns2008-11-041-3/+4
| | * | sata_nv: fix generic, nf2/3 detection regressionTejun Heo2008-11-041-28/+25
| | * | sata_via: restore vt*_prepare_host error handlingMarcin Slusarz2008-11-041-1/+3
| | * | sata_promise: add ATA engine reset to reset opsMikael Pettersson2008-11-041-0/+20
| * | | drivers: remove duplicated #includeJianjun Kong2008-11-048-8/+0
| |/ /
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2008-11-038-30/+86
| |\ \
| | * | cifs: fix renaming one hardlink on top of anotherJeff Layton2008-11-031-1/+3
| | * | [CIFS] fix error in smb_send2Steve French2008-10-303-4/+7
| | * | [CIFS] Reduce number of socket retries in large write pathSteve French2008-10-295-25/+76
| * | | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2008-11-033-19/+80
| |\ \ \
| | * | | tracing, ring-buffer: add paranoid checks for loopsSteven Rostedt2008-11-031-0/+56
| | * | | ftrace: use kretprobe trampoline name to test in outputSteven Rostedt2008-11-031-18/+21
| | * | | tracing, alpha: undefined reference to `save_stack_trace'Al Viro2008-11-032-1/+3
| * | | | Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2008-11-0312-105/+390
| |\ \ \ \
| | * | | | io mapping: clean up #ifdefsKeith Packard2008-11-032-18/+29
| | * | | | io mapping: improve documentationKeith Packard2008-11-031-3/+9
| | * | | | i915: use io-mapping interfaces instead of a variety of mapping kludgesKeith Packard2008-10-312-94/+83
| | * | | | resources: add io-mapping functions to dynamically map large device aperturesKeith Packard2008-10-312-0/+194
| | * | | | x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmapsKeith Packard2008-10-317-11/+96
| * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2008-11-0316-60/+89
| |\ \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | *-. \ \ \ \ Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linusTakashi Iwai2008-11-0316-60/+89
| | |\ \ \ \ \ \
| | | | * | | | | ALSA: hda: make a STAC_DELL_EQ optionMatthew Ranostay2008-11-031-6/+10
| | | | * | | | | ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)Takashi Iwai2008-11-031-0/+1
| | | | * | | | | ALSA: hda - Add digital-mic for ALC269 auto-probe modeTakashi Iwai2008-10-311-2/+20
| | | | * | | | | ALSA: hda - Disable broken mic auto-muting in Realtek codesTakashi Iwai2008-10-311-0/+6
| | | * | | | | | ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy modelsTakashi Iwai2008-11-031-0/+3
| | | * | | | | | ALSA: remove direct access of dev->bus_id in sound/isa/*Takashi Iwai2008-11-038-45/+34
| | | * | | | | | sound: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2008-11-033-5/+5
| | | * | | | | | ALSA: Fix PIT lockup on some chipsets when using the PC-SpeakerZoltan Devai2008-11-031-2/+2
| | | * | | | | | ALSA: rawmidi - Add open check in rawmidi callbacksTakashi Iwai2008-11-031-0/+8
| * | | | | | | | Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ad...Linus Torvalds2008-11-031-18/+20
| |\ \ \ \ \ \ \ \