1. 03 Aug, 2006 6 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 90eb29ef
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (24 commits)
        Revert "[PATCH] USB: move usb_device_class class devices to be real devices"
        Revert "[PATCH] USB: convert usb class devices to real devices"
        USB: UHCI: Don't test the Short Packet Detect bit
        USB: unusual_devs entry for Nokia 3250
        USB: dummy-hcd: disable interrupts during req->complete
        USB: fix the USB_GADGET_DUMMY_HCD dependencies
        USB: ati_remote.c: autorepeat fix
        USB: doc: fixes devio.c location in proc_usb_info.txt.
        USB: doc: usb-help.txt update.
        USB: Patch for rtl8150 to fix unplug problems
        USB: cypress driver comment updates
        USB: unusual_devs device removal
        usb-storage: Add US_FL_IGNORE_DEVICE flag; ignore ZyXEL G220F
        USB: New USB ID for Belkin Serial Adapter
        USB: Additional PID for the ftdi_sio driver
        USB: adding support for SHARP WS003SH to ipaq.c
        USB: Fix Freescale high-speed USB host dependency
        USB: Removed 3-port device handler from Option driver
        USB: Drop Sierra Wireless MC8755 from the Option driver
        USB: Let option driver handle Anydata CDMA modems. Remove anydata driver.
        ...
      90eb29ef
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 1398ab7c
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
        [ARM] 3739/1: genirq updates:  irq_chip, add and use irq_chip.name
      1398ab7c
    • Muli Ben-Yehuda's avatar
      [PATCH] x86_64: Fix CONFIG_IOMMU_DEBUG · a166222c
      Muli Ben-Yehuda authored
      If CONFIG_IOMMU_DEBUG is set force_iommu defaults to 1. In the case
      where no HW IOMMU is present in the machine and we end up using nommu,
      leaving force_iommu set to 1 causes dma_alloc_coherent to do the wrong
      thing. Therefore, if we end up using nommu, make sure force_iommu is
      0.
      Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      a166222c
    • Andi Kleen's avatar
      [PATCH] x86_64: Fix backtracing for interrupt stacks · 2699500b
      Andi Kleen authored
      Re-add backlink for old style unwinder to stack switching.  Add proper
      stack frame and CFI annotations to call_softirq
      
      This prevents a oops when backtracing with fallback through the
      interrupt stack top.
      
      Suggested by Jan Beulich and Herbert Xu wanted it in 2.6.18.
      
      Cc: jbeulich@novell.com
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      2699500b
    • Linus Torvalds's avatar
      Fix force_sig_info() semantics after cleanups · ae74c3b6
      Linus Torvalds authored
      Suresh points out that commit b0423a0d
      broke the semantics of a synchronous signal like SIGSEGV occurring
      recursively inside its own handler handler (or, indeed, any other
      context when the signal was blocked).
      
      That was unintentional, and this fixes things up by reinstating the old
      semantics, but without reverting the cleanups.
      
      Cc: Paul E. McKenney <paulmck@us.ibm.com>
      Acked-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      ae74c3b6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 · 202668ec
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18:
        gitignore: gitignore quilt's files
        kbuild: always use $(CC) for $(call cc-version)
        kconfig: correct oldconfig for unset choice options
        kbuild: -fno-stack-protector is not good
        kbuild: fix typo in modpost
        kbuild: improve error from file2alias
        kbuild: .gitignore utsrelease.h
        kbuild: version.h and new headers_* targets does not require a kernel config
        kbuild: hardcode value of YACC&LEX for aic7-triple-x
      202668ec
  2. 02 Aug, 2006 26 commits
  3. 01 Aug, 2006 8 commits