1. 01 8月, 2007 29 次提交
  2. 31 7月, 2007 11 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23 · 6a302358
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
        sh: Fix fs.h removal from mm.h regressions.
        sh: fix get_wchan() for SH kernels without framepointers
        sh: arch/sh/boot - fix shell usage
        rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts.
        sh: remove support for sh7300 and solution engine 7300
        sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies.
        sh: Kill off virt_to_bus()/bus_to_virt().
        sh: sh-sci - fix SH7708 support
        sh: Restrict DSP support to specific CPUs.
        sh: Silence sq compile warning on sh4 nommu.
        sh: Kill the rest of the SE73180 cruft.
        sh: remove support for sh73180 and solution engine 73180
        sh: remove old broken pint code
        sh: Reclaim beginning of P3 space for vmalloc area.
        sh: Fix Dreamcast DMA issues.
        sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.
      6a302358
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 · 8e268f33
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
        sh64: Kill off virt_to_bus()/bus_to_virt().
        sh64: Fix irq_intc build failure.
        sh64: Fix fs.h removal from mm.h regressions.
      8e268f33
    • P
      sh64: Kill off virt_to_bus()/bus_to_virt(). · 75c46162
      Paul Mundt 提交于
      Follows the SH change.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      75c46162
    • P
      sh64: Fix irq_intc build failure. · da9d5108
      Paul Mundt 提交于
      Needs interrupt.h:
      
        CC      arch/sh64/kernel/irq_intc.o
      arch/sh64/kernel/irq_intc.c: In function 'make_intc_irq':
      arch/sh64/kernel/irq_intc.c:179: error: implicit declaration of function 'disable_irq_nosync'
      make[1]: *** [arch/sh64/kernel/irq_intc.o] Error 1
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      da9d5108
    • P
      sh64: Fix fs.h removal from mm.h regressions. · 78d98277
      Paul Mundt 提交于
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      78d98277
    • P
      sh: Fix fs.h removal from mm.h regressions. · e06c4e57
      Paul Mundt 提交于
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      e06c4e57
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · cbdd3deb
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        Fix a potential NULL pointer dereference in mace_interrupt() in drivers/net/pcmcia/nmclan_cs.c
        PATCH kernel 2.6.22] PCMCIA-NETDEV : modify smc91c92_cs.c to become SMP safe
        S2io: Increment received packet count correctly
        S2io: Fix crash when resetting adapter
        S2io: Mask spurious interrupts
        S2IO: Implementing review comments from old patches
        S2IO: Checking for the return value of pci map function
        S2IO: Removing MSI support from driver
        S2IO: Removing 3 buffer mode support from the driver
        netxen: drop redudant spinlock
        netxen: Fix interrupt handling for multiport adapters
        netxen: re-init station address after h/w init
        tulip: Remove tulip maintainer
        forcedeth: mac address correct
        gfar: Fix modpost warning
        lib8390: comment on locking by Alan Cox
        Fix a potential NULL pointer dereference in write_bulk_callback() in drivers/net/usb/pegasus.c
      cbdd3deb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 4dcf39c6
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/ipath: Workaround problem of errormask register being overwritten
        IB/ipath: Fix some issues with buffer cancel and sendctrl register update
        IB/ipath: Use faster put_tid_2 routine after initialization
        IB/ipath: Remove unsafe fastrcvint code from interrupt handler
        IB/ehca: Move extern declarations from .c files to .h files
        IB/mlx4: Whitespace fix
        IB/ehca: Fix include order to better match kernel style
        mlx4_core: Remove kfree() in mlx4_mr_alloc() error flow
        RDMA/amso1100: Initialize the wait_queue_head_t in the c2_qp structure
      4dcf39c6
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · af947311
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        modules: better error messages when modules fail to load due to a sysfs problem.
        kobject: update documentation
        kset: kernel-doc cleanups
        driver core: revert "device" link creation check
        stable_api_nonsense.txt: Disambiguate the use of "this" by using "that" to refer to the syscall interface
        Fix Doc/sysfs-rules typos
        kernel-doc fixes for PCI and drivers/base/
        kobject: put kobject_actions in kobject.h
        kobject: fix link error when CONFIG_HOTPLUG is disabled
        HOWTO: sync Japanese HOWTO
        HOWTO: adjust translation header of Japanese stable_api_nonsense.txt
      af947311
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 9f8e35fc
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: "sparse" cleanups for usb gadgets
        usb-serial: Fix edgeport regression on non-EPiC devices
        USB: more pxa2xx_udc dead code removal
        USB: NIKON D50 is an unusual device
        USB: drivers/usb/serial/sierra.c: make 3 functions static
        USB: fix BUG: sleeping function called from invalid context at /home/jeremy/hg/xen/paravirt/linux/drivers/usb/core/urb.c:524, in_atomic():1, irqs_disabled():0
        USB: mct_u232: Convert to proper speed handling API
        digi_acceleport: Drag the driver kicking and screaming into coding style
        cp2101: Remove broken termios optimisation, use proper speed API
        USB: Fix a bug in usb_start_wait_urb
        USB: fix scatterlist PIO case (IOMMU)
        USB: fix usb_serial_suspend(): buggy code
        USB: yet another quirky device
        USB: Add CanonScan LiDE30 to the quirk list
        USB: even more quirks
        USB: usb.h kernel-doc additions
        USB: more quirky devices
        USB: Don't let usb-storage steal Blackberry Pearl
        USB: devices misc: Trivial patch to build the IOWARRIOR when it is selected in Kconfig
      9f8e35fc
    • G
      modules: better error messages when modules fail to load due to a sysfs problem. · 74c5b597
      Greg Kroah-Hartman 提交于
      This helps people when debugging problems like the ones that were in the
      recent -mm releases.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      74c5b597