1. 26 6月, 2006 32 次提交
  2. 25 6月, 2006 8 次提交
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · dfd8317d
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits)
        [ARM] 3648/1: Update struct ucontext layout for coprocessor registers
        [ARM] Add identifying number for non-rt sigframe
        [ARM] Gather common sigframe saving code into setup_sigframe()
        [ARM] Gather common sigframe restoration code into restore_sigframe()
        [ARM] Re-use sigframe within rt_sigframe
        [ARM] Merge sigcontext and sigmask members of sigframe
        [ARM] Replace extramask with a full copy of the sigmask
        [ARM] Remove rt_sigframe puc and pinfo pointers
        [ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines
        [ARM] 3645/1: S3C2412: irq support for external interrupts
        [ARM] 3643/1: S3C2410: Add new usb clocks
        [ARM] 3642/1: S3C24XX: Add machine SMDK2413
        [ARM] 3641/1: S3C2412: Fixup gpio register naming
        [ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON
        [ARM] 3639/1: S3C2412: serial port support
        [ARM] 3638/1: S3C2412: core clocks
        [ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent
        [ARM] 3636/1: S3C2412: Add selection of CPU_ARM926
        [ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support
        [ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos
        ...
      dfd8317d
    • L
      Revert "[PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer" · 83626b01
      Linus Torvalds 提交于
      This reverts commit 786dc1d3.
      
      As Al so eloquently points out, the patch is crap. The old code was fine,
      the new code was bogus.
      
      It never dereferenced a user pointer, the "->" operator was to an array
      member, which gives the _address_ of the member (in user space), not an
      actual dereference at all.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      83626b01
    • R
      Merge signal handler branch · c0897856
      Russell King 提交于
      c0897856
    • D
      [ARM] 3648/1: Update struct ucontext layout for coprocessor registers · 85fe0681
      Daniel Jacobowitz 提交于
      Patch from Daniel Jacobowitz
      
      In order for userspace to find saved coprocessor registers, move them from
      struct rt_sigframe into struct ucontext.  Also allow space for glibc's
      sigset_t, so that userspace and kernelspace can use the same ucontext
      layout.  Define the magic numbers for iWMMXt in the header file for easier
      reference.  Include the size of the coprocessor data in the magic numbers.
      
      Also define magic numbers and layout for VFP, not yet saved.
      Signed-off-by: NDaniel Jacobowitz <dan@codesourcery.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      85fe0681
    • L
      Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · abb1cf3c
      Linus Torvalds 提交于
      * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: radeon constify radeon microcode
        Add i915 ioctls to configure pipes for vblank interrupt.
        drm: update radeon to 1.25 add r200 vertex program support
        drm: radeon add a tcl state flush before accessing tcl vector space
      abb1cf3c
    • L
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · b9d8be78
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits)
        [SPARC64]: Update defconfig.
        [SPARC64]: Make auxio a real driver.
        [PARPORT] sunbpp: Convert to new SBUS device framework.
        [Documentation]: Update probing info in sbus_drivers.txt
        [SCSI] qlogicpti: Convert to new SBUS device framework.
        [SCSI] esp: Fix bug in esp_remove_common.
        [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
        [NET] myri_sbus: Kill unused next_module struct member.
        [NET] myri_sbus: Convert to new SBUS device layer.
        [NET] sunqe: Convert to new SBUS driver layer.
        [NET] sunbmac: Convert over to new SBUS device framework.
        [NET] sunlance: Convert to new SBUS driver framework.
        [NET] sunhme: Convert to new SBUS driver framework.
        [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs.
        [SCSI] sparc: Port esp to new SBUS driver layer.
        [SOUND] sparc: Port amd7930 to new SBUS device layer.
        [SBUS]: Rewrite and plug into of_device framework.
        [SPARC]: Port of_device layer and make ebus use it.
        [SPARC]: Port sparc64 in-kernel device tree code to sparc32.
        [SPARC64]: Add of_device layer and make ebus/isa use it.
        ...
      b9d8be78
    • L
      Enable minimal per-device resume tracing · d02f40e8
      Linus Torvalds 提交于
      This is the minimal resume trace code to find which device resume (if
      any) results in problems.  Usually, you'd use the information this
      generates as a starting point to adding more fine-grained trace event
      points.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      d02f40e8