summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-05-1921-384/+453
|\
| * drivers/ata: trim trailing whitespaceJeff Garzik2008-05-192-5/+5
| * Fixups to ATA ACPI hotplugMatthew Garrett2008-05-191-27/+50
| * libata: ignore SIMG4726 config pseudo deviceTejun Heo2008-05-193-9/+9
| * sata_sil24: don't use NCQ if marvell 4140 PMP is attachedTejun Heo2008-05-191-0/+11
| * libata: don't schedule LPM action seperately during probingTejun Heo2008-05-191-2/+1
| * libata: make sure PMP notification is turned off during recoveryTejun Heo2008-05-191-16/+20
| * libata: increase PMP register access timeout to 3sTejun Heo2008-05-192-3/+3
| * libata: ignore recovered PHY errorsTejun Heo2008-05-191-6/+1
| * libata: kill hotplug related race conditionTejun Heo2008-05-192-23/+50
| * libata: move reset freeze/thaw handling into ata_eh_reset()Tejun Heo2008-05-192-32/+18
| * libata: reorganize ata_eh_reset() no reset method pathTejun Heo2008-05-191-50/+52
| * libata: fix sata_link_hardreset() @online out parameter handlingTejun Heo2008-05-191-1/+5
| * sata_promise: other cleanupsMikael Pettersson2008-05-191-16/+7
| * sata_promise: mmio access cleanupsMikael Pettersson2008-05-191-59/+65
| * sata_promise: fix irq clearing bugletsMikael Pettersson2008-05-191-4/+3
| * ata: remove FIT() macroHarvey Harrison2008-05-1910-66/+64
| * sata_mv: ensure empty request queue for FBS-NCQ EHMark Lord2008-05-191-2/+14
| * sata_mv: cache main_irq_mask register in hprivMark Lord2008-05-191-5/+7
| * sata_mv: disregard masked irqsMark Lord2008-05-191-4/+5
| * sata_mv: fix pmp drives not foundMark Lord2008-05-191-1/+4
| * sata_mv: consolidate main_irq_mask updatesMark Lord2008-05-191-25/+32
| * sata_mv: don't blindly enable IRQsMark Lord2008-05-191-26/+6
| * sata_mv: async notify for genIIe onlyMark Lord2008-05-191-2/+12
| * sata_mv: group genIIe flagsMark Lord2008-05-191-9/+8
| * sata_mv: fis irq register fixesMark Lord2008-05-191-4/+12
| * sata_mv: always do softresetMark Lord2008-05-191-0/+1
| * avr32/pata: avoid unnecessary memset (updated after comments)Christophe Jaillet2008-05-191-2/+0
| * pata-bf54x: Set ATAPI HSM to control IDE device terminate sequence.Sonic Zhang2008-05-191-1/+4
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei...Linus Torvalds2008-05-194-16/+17
|\ \
| * | dlm: <linux/dlm_plock.h> should be "unifdef"ed.Robert P. J. Day2008-05-191-1/+1
| * | dlm: fix plock dev_write return valueDavid Teigland2008-05-191-1/+1
| * | dlm: tcp_connect_to_sock should check for -EINVAL, not EINVALMarcin Slusarz2008-05-191-1/+1
| * | dlm: section mismatch warning fixLeonardo Potenza2008-05-191-1/+1
| * | dlm: convert connections_lock in a mutexMatthias Kaehlcke2008-05-191-12/+13
| |/
* | Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-05-1911-47/+65
|\ \ | |/ |/|
| * KVM: LAPIC: ignore pending timers if LVTT is disabledMarcelo Tosatti2008-05-181-1/+1
| * KVM: Update MAINTAINERS for new mailing listsAvi Kivity2008-05-181-7/+7
| * KVM: Fix kvm_vcpu_block() task state raceMarcelo Tosatti2008-05-181-14/+15
| * KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48Xiantao Zhang2008-05-181-1/+1
| * KVM: ia64: fix GVMM module including position-dependent objectsXiantao Zhang2008-05-183-2/+3
| * KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpregXiantao Zhang2008-05-181-2/+8
| * KVM: PIT: take inject_pending into account when emulating hltMarcelo Tosatti2008-05-181-1/+1
| * s390: KVM guest: fix compile errorHeiko Carstens2008-05-181-17/+23
| * KVM: x86 emulator: fix writes to registers with modrm encodingsAvi Kivity2008-05-182-2/+6
* | Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2008-05-1922-1403/+513
|\ \
| * | drm/i915: save and restore dsparb and d_state registers.Keith Packard2008-05-072-0/+17
| * | drm/i915: fix off by one in VGA save/restore of AR & CR regs.Jesse Barnes2008-05-072-6/+6
| * | drm: disable tasklets not IRQs when taking the drm lock spinlockThomas Hellstrom2008-05-072-25/+17
| * | Revert "drm/vbl rework: rework how the drm deals with vblank."Dave Airlie2008-05-0720-1372/+473
OpenPOWER on IntegriCloud