1. 27 2月, 2010 25 次提交
  2. 26 2月, 2010 7 次提交
    • L
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 6ebdc661
      Linus Torvalds 提交于
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits)
        of: remove undefined request_OF_resource & release_OF_resource
        of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
        of: move definition of of_chosen into common code.
        of: remove unused extern reference to devtree_lock
        of: put default string compare and #a/s-cell values into common header
        of/flattree: Don't assume HAVE_LMB
        of: protect linux/of.h with CONFIG_OF
        proc_devtree: fix THIS_MODULE without module.h
        of: Remove old and misplaced function declarations
        of/flattree: Make the kernel accept ePAPR style phandle information
        of/flattree: endian-convert members of boot_param_header
        of: assume big-endian properties, adding conversions where necessary
        of: use __be32 for cell value accessors
        of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing
        of/flattree: use callback to setup initrd from /chosen
        proc_devtree: include linux/of.h
        of: make set_node_proc_entry private to proc_devtree.c
        of: include linux/proc_fs.h
        of/flattree: merge early_init_dt_scan_memory() common code
        of: add 'of_' prefix to machine_is_compatible()
        ...
      6ebdc661
    • L
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · d7930c9e
      Linus Torvalds 提交于
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (31 commits)
        spi: Correct SPI clock frequency setting in spi_mpc8xxx
        spi/spi_s3c64xx.c: Fix continuation line formats
        spi/dw_spi: Fix dw_spi_mmio to depend on HAVE_CLK
        spi/dw_spi: Allow dw_spi.c to be a module
        spi/dw_spi: mmio code style fixups
        Memory-mapped dw_spi driver
        spi/dw_spi: fix missing export of dw_spi_remove_host
        spi/dw_spi: conditional transfer mode changes
        spi/dw_spi: remove conditional from 'poll_transfer'.
        spi/dw_spi: fixed a spelling typo in a warning message.
        spi/dw_spi: add return value to empty mrst_spi_debugfs_init()
        spi/dw_spi: enable platform specific chipselect.
        spi/dw_spi: add a FIFO depth detection
        spi/dw_spi: fix __init/__devinit section mismatch
        spi: xilinx_spi: Fix up I/O routine wrapping bogosity.
        spi/spi_imx: add device information by switching pr_debug() to dev_dbg()
        spi: update MSIOF includes
        spi/dw_spi: refine the IRQ mode working flow
        spi/dw_spi: add a missed dw_spi_remove_host() in exit sequence
        spi/dw_spi: bug fix in wait_till_not_busy()
        ...
      d7930c9e
    • L
      Merge branch 'for-linus-2' of... · b6d97026
      Linus Torvalds 提交于
      Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig
      
      * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
        kconfig: Simplify LSMOD= handling
        kconfig: Add LSMOD=file to override the lsmod for localmodconfig
        kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl
        kconfig: Check for if conditions in Kconfig for localmodconfig
        kconfig: Create include/generated for localmodconfig
      b6d97026
    • L
      Merge branch 'for-linus-1' of... · 1954ee55
      Linus Torvalds 提交于
      Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig
      
      * 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
        kconfig: simplification of scripts/extract-ikconfig
      1954ee55
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · a85821fc
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (41 commits)
        HID: usbhid: initialize interface pointers early enough
        HID: extend mask for BUTTON usage page
        HID: hid-ntrig: Single touch mode tap
        HID: hid-ntrig: multitouch cleanup and fix
        HID: n-trig: remove unnecessary tool switching
        HID: hid-ntrig add multi input quirk and clean up
        HID: usbhid: introduce timeout for stuck ctrl/out URBs
        HID: magicmouse: coding style and probe failure fixes
        HID: remove MODULE_VERSION from new drivers
        HID: fix up Kconfig entry for MagicMouse
        HID: add a device driver for the Apple Magic Mouse.
        HID: Export hid_register_report
        HID: Support for MosArt multitouch panel
        HID: add pressure support for the Stantum multitouch panel
        HID: fixed bug in single-touch emulation on the stantum panel
        HID: fix typo in error message
        HID: add mapping for "AL Network Chat" usage
        HID: use multi input quirk for TouchPack touchscreen
        HID: make full-fledged hid-bus drivers properly selectable
        HID: make Wacom modesetting failures non-fatal
        ...
      a85821fc
    • J
      Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus · 14ef2b0c
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/Kconfig
      14ef2b0c
    • T
      x86/PCI: Prevent mmconfig memory corruption · bb8d4133
      Thomas Gleixner 提交于
      commit ff097ddd (x86/PCI: MMCONFIG: manage pci_mmcfg_region as a
      list, not a table) introduced a nasty memory corruption when
      pci_mmcfg_list is empty.
      
      pci_mmcfg_check_end_bus_number() dereferences pci_mmcfg_list.prev even
      when the list is empty. The following write hits some variable near to
      pci_mmcfg_list.
      
      Further down a similar problem exists, where cfg->list.next is
      dereferenced unconditionally and a comparison with some variable near
      to pci_mmcfg_list happens.
      
      Add a check for the last element into the for_each_entry() loop and
      remove all the other crappy logic which is just a leftover of the old
      array based code which was replaced by the list conversion.
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
      Cc: Yinghai Lu <yinghai@kernel.org>
      Cc: stable@kernel.org
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      bb8d4133
  3. 25 2月, 2010 8 次提交