1. 04 3月, 2010 5 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 94468080
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
        jsm: fixing error if the driver fails to load
        jsm: removing the uart structure and filename on error
        tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call
        tty: Keep the default buffering to sub-page units
        tty: Fix up char drivers request_room usage
        tty: Fix the ldisc hangup race
        serial: timberdale: Remove dependancies
        nozomi: Tidy up the PCI table
        nozomi: Fix mutex handling
        nozomi: Add tty_port usage
        sdio_uart: Use kfifo instead of the messy circ stuff
        serial: bcm63xx_uart: allow more than one uart to be registered.
        serial: bcm63xx_uart: don't use kfree() on non kmalloced area.
        serial: bfin_5xx: pull in linux/io.h for ioremap prototypes
        serial: bfin_5xx: kgdboc should accept gdb break only when it is active
        serial: bfin_5xx: need to disable DMA TX interrupt too
        serial: bfin_5xx: remove useless gpio handling with hard flow control
        Char: synclink, remove unnecessary checks
        tty: declare MODULE_FIRMWARE in various drivers
        ip2: Add module parameter.
        ...
      94468080
    • L
      Merge branch 'x86-apic-for-linus' of... · fb7b096d
      Linus Torvalds 提交于
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
        x86: Fix out of order of gsi
        x86: apic: Fix mismerge, add arch_probe_nr_irqs() again
        x86, irq: Keep chip_data in create_irq_nr and destroy_irq
        xen: Remove unnecessary arch specific xen irq functions.
        smp: Use nr_cpus= to set nr_cpu_ids early
        x86, irq: Remove arch_probe_nr_irqs
        sparseirq: Use radix_tree instead of ptrs array
        sparseirq: Change irq_desc_ptrs to static
        init: Move radix_tree_init() early
        irq: Remove unnecessary bootmem code
        x86: Add iMac9,1 to pci_reboot_dmi_table
        x86: Convert i8259_lock to raw_spinlock
        x86: Convert nmi_lock to raw_spinlock
        x86: Convert ioapic_lock and vector_lock to raw_spinlock
        x86: Avoid race condition in pci_enable_msix()
        x86: Fix SCI on IOAPIC != 0
        x86, ia32_aout: do not kill argument mapping
        x86, irq: Move __setup_vector_irq() before the first irq enable in cpu online path
        x86, irq: Update the vector domain for legacy irqs handled by io-apic
        x86, irq: Don't block IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's
        ...
      fb7b096d
    • L
      Merge branch 'x86-bootmem-for-linus' of... · a626b46e
      Linus Torvalds 提交于
      Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        early_res: Need to save the allocation name in drop_range_partial()
        sparsemem: Fix compilation on PowerPC
        early_res: Add free_early_partial()
        x86: Fix non-bootmem compilation on PowerPC
        core: Move early_res from arch/x86 to kernel/
        x86: Add find_fw_memmap_area
        Move round_up/down to kernel.h
        x86: Make 32bit support NO_BOOTMEM
        early_res: Enhance check_and_double_early_res
        x86: Move back find_e820_area to e820.c
        x86: Add find_early_area_size
        x86: Separate early_res related code from e820.c
        x86: Move bios page reserve early to head32/64.c
        sparsemem: Put mem map for one node together.
        sparsemem: Put usemap for one node together
        x86: Make 64 bit use early_res instead of bootmem before slab
        x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA
        x86: Make early_node_mem get mem > 4 GB if possible
        x86: Dynamically increase early_res array size
        x86: Introduce max_early_res and early_res_count
        ...
      a626b46e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · c1dcb4bb
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits)
        firewire: ohci: extend initialization log message
        firewire: ohci: fix IR/IT context mask mixup
        firewire: ohci: add module parameter to activate quirk fixes
        firewire: ohci: use an ID table for quirks detection
        firewire: ohci: reorder struct fw_ohci for better cache efficiency
        firewire: ohci: remove unused dualbuffer IR code
        firewire: core: combine a bit of repeated code
        firewire: core: change type of a data buffer
        firewire: cdev: increment ABI version number
        firewire: cdev: add more flexible cycle timer ioctl
        firewire: core: rename an internal function
        firewire: core: fix an information leak
        firewire: core: increase stack size of config ROM reader
        firewire: core: don't fail device creation in case of too large config ROM blocks
        firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500
        firewire: remove incomplete Bus_Time CSR support
        firewire: get_cycle_timer optimization and cleanup
        firewire: ohci: enable cycle timer fix on ALi and NEC controllers
        firewire: ohci: work around cycle timer bugs on VIA controllers
        firewire: make PCI device id constant
        ...
      c1dcb4bb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 60f8a8d4
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix large stack use
        fuse: cleanup in fuse_notify_inval_...()
      60f8a8d4
  2. 03 3月, 2010 35 次提交