summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2008-05-199-45/+49
|\
| * sh: Fix up restorer in debug_trap exception return path.Paul Mundt2008-05-191-6/+5
| * sh: Make is_valid_bugaddr() more intelligent on nommu.Paul Mundt2008-05-191-1/+9
| * sh: use the common ascii hex helpersHarvey Harrison2008-05-163-24/+9
| * sh: fix sh7785 master clock valueYoshihiro Shimoda2008-05-161-1/+1
| * sh: Fix up thread info pointer in syscall_badsys resume path.Hideo Saito2008-05-161-0/+1
| * sh: Fix up optimized SH-4 memcpy on big endian.Hideo Saito2008-05-161-11/+11
| * sh: disable initrd defaults in .empty_zero_page.Paul Mundt2008-05-161-2/+2
| * sh: display boot params by default on entry.Paul Mundt2008-05-161-0/+11
* | 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
OpenPOWER on IntegriCloud