1. 30 4月, 2008 34 次提交
  2. 29 4月, 2008 6 次提交
    • M
      doc: replace yet another dev with pdev for consistency in DMA-mapping.txt · 2768f92c
      Matti Linnanvuori 提交于
      Replace "dev" with "pdev" for consistency in DMA-mapping.txt.
      Signed-off-by: NMatti Linnanvuori <mattilinnanvuori@yahoo.com>
      Signed-off-by: NJesse Barnes <jbarnes@hobbes.lan>
      2768f92c
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · c135b659
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2)
        sata_mv: Improve naming of main_irq cause/mask identifiers
        libata-scsi: improve rbuf handling for simulated commands
        libata-scsi: clean up inquiry / mode sense related functions
        [MIPS] ATA: Rename routerboard 500 to 532
      c135b659
    • L
      Merge branch 'for-linus' of... · 5f78e4d3
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci:
        x86: add pci=check_enable_amd_mmconf and dmi check
        x86: work around io allocation overlap of HT links
        acpi: get boot_cpu_id as early for k8_scan_nodes
        x86_64: don't need set default res if only have one root bus
        x86: double check the multi root bus with fam10h mmconf
        x86: multi pci root bus with different io resource range, on 64-bit
        x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
        x86: get mp_bus_to_node early
        x86 pci: remove checking type for mmconfig probe
        x86: remove unneeded check in mmconf reject
        driver core: try parent numa_node at first before using default
        x86: seperate mmconf for fam10h out from setup_64.c
        x86: if acpi=off, force setting the mmconf for fam10h
        x86_64: check MSR to get MMCONFIG for AMD Family 10h
        x86_64: check and enable MMCONFIG for AMD Family 10h
        x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
        x86: mmconf enable mcfg early
        x86: clear pci_mmcfg_virt when mmcfg get rejected
        x86: validate against acpi motherboard resources
      
      Fixed up fairly trivial conflicts in arch/x86/pci/{init.c,pci.h} due to
      OLPC support manually.
      5f78e4d3
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 867a89e0
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [RAPIDIO] Change RapidIO doorbell source and target ID field to 16-bit
        [RAPIDIO] Add RapidIO connection info print out and re-training for broken connections
        [RAPIDIO] Add serial RapidIO controller support, which includes MPC8548, MPC8641
        [RAPIDIO] Add RapidIO node probing into MPC86xx_HPCN board id table
        [RAPIDIO] Add RapidIO node into MPC8641HPCN dts file
        [RAPIDIO] Auto-probe the RapidIO system size
        [RAPIDIO] Add OF-tree support to RapidIO controller driver
        [RAPIDIO] Add RapidIO multi mport support
        [RAPIDIO] Move include/asm-ppc/rio.h to asm-powerpc
        [RAPIDIO] Add RapidIO option to kernel configuration
        [RAPIDIO] Change RIO function mpc85xx_ to fsl_
        [POWERPC] Provide walk_memory_resource() for powerpc
        [POWERPC] Update lmb data structures for hotplug memory add/remove
        [POWERPC] Hotplug memory remove notifications for powerpc
        [POWERPC] windfarm: Add PowerMac 12,1 support
        [POWERPC] Fix building of pmac32 when CONFIG_NVRAM=m
        [POWERPC] Add IRQSTACKS support on ppc32
        [POWERPC] Use __always_inline for xchg* and cmpxchg*
        [POWERPC] Add fast little-endian switch system call
      867a89e0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 44473d99
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] state info wrong after resume
        [CPUFREQ] allow use of the powersave governor as the default one
        [CPUFREQ] document the currently undocumented parts of the sysfs interface
        [CPUFREQ] expose cpufreq coordination requirements regardless of coordination mechanism
      44473d99
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · bd5d435a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: Skip I/O merges when disabled
        block: add large command support
        block: replace sizeof(rq->cmd) with BLK_MAX_CDB
        ide: use blk_rq_init() to initialize the request
        block: use blk_rq_init() to initialize the request
        block: rename and export rq_init()
        block: no need to initialize rq->cmd with blk_get_request
        block: no need to initialize rq->cmd in prepare_flush_fn hook
        block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline
        block/elevator.c:elv_rq_merge_ok() mustn't be inline
        block: make queue flags non-atomic
        block: add dma alignment and padding support to blk_rq_map_kern
        unexport blk_max_pfn
        ps3disk: Remove superfluous cast
        block: make rq_init() do a full memset()
        relay: fix splice problem
      bd5d435a