1. 03 2月, 2008 34 次提交
  2. 02 2月, 2008 6 次提交
    • L
      Merge git://git.infradead.org/battery-2.6 · ae9458d6
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        apm_power: check I.intval for zero value, we use it as the divisor
        MAINTAINERS: remove kernel-discuss@handhelds.org list
        pda_power: implement polling
        pda_power: various cleanups
        apm_power: support using VOLTAGE_* properties for apm calculations
        pda_power: add suspend/resume support
        power_supply: add few more values and props
        pda_power: only register available psu
        power: fix incorrect unregistration in power_supply_create_attrs error path
        power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL
        [BATTERY] power_supply_leds: use kasprintf
        [BATTERY] Every file should include the headers containing the prototypes for its global functions.
      ae9458d6
    • L
      Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux · 63e9b66e
      Linus Torvalds 提交于
      * 'for-linus' of git://linux-nfs.org/~bfields/linux: (100 commits)
        SUNRPC: RPC program information is stored in unsigned integers
        SUNRPC: Move exported symbol definitions after function declaration part 2
        NLM: tear down RPC clients in nlm_shutdown_hosts
        SUNRPC: spin svc_rqst initialization to its own function
        nfsd: more careful input validation in nfsctl write methods
        lockd: minor log message fix
        knfsd: don't bother mapping putrootfh enoent to eperm
        rdma: makefile
        rdma: ONCRPC RDMA protocol marshalling
        rdma: SVCRDMA sendto
        rdma: SVCRDMA recvfrom
        rdma: SVCRDMA Core Transport Services
        rdma: SVCRDMA Transport Module
        rdma: SVCRMDA Header File
        svc: Add svc_xprt_names service to replace svc_sock_names
        knfsd: Support adding transports by writing portlist file
        svc: Add svc API that queries for a transport instance
        svc: Add /proc/sys/sunrpc/transport files
        svc: Add transport hdr size for defer/revisit
        svc: Move the xprt independent code to the svc_xprt.c file
        ...
      63e9b66e
    • L
      Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 687fcdf7
      Linus Torvalds 提交于
      * 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (38 commits)
        suspend: cleanup reference to swsusp_pg_dir[]
        PM: Remove obsolete /sys/devices/.../power/state docs
        Hibernation: Invoke suspend notifications after console switch
        Suspend: Invoke suspend notifications after console switch
        Suspend: Clean up suspend_64.c
        Suspend: Add config option to disable the freezer if architecture wants that
        ACPI: Print message before calling _PTS
        ACPI hibernation: Call _PTS before suspending devices
        Hibernation: Introduce begin() and end() callbacks
        ACPI suspend: Call _PTS before suspending devices
        ACPI: Separate disabling of GPEs from _PTS
        ACPI: Separate invocations of _GTS and _BFS from _PTS and _WAK
        Suspend: Introduce begin() and end() callbacks
        suspend: fix ia64 allmodconfig build
        ACPI: clear GPE earily in resume to avoid warning
        Suspend: Clean up Kconfig (V2)
        Hibernation: Clean up Kconfig (V2)
        Hibernation: Update messages
        Suspend: Use common prefix in messages
        Hibernation: Remove unnecessary variable declaration
        ...
      687fcdf7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 215e871a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (64 commits)
        PCI: make pci_bus a struct device
        PCI: fix codingstyle issues in include/linux/pci.h
        PCI: fix codingstyle issues in drivers/pci/pci.h
        PCI: PCIE ASPM support
        PCI: Fix fakephp deadlock
        PCI: modify SB700 SATA MSI quirk
        PCI: Run ACPI _OSC method on root bridges only
        PCI ACPI: AER driver should only register PCIe devices with _OSC
        PCI ACPI: Added a function to register _OSC with only PCIe devices.
        PCI: constify function pointer tables
        PCI: Convert drivers/pci/proc.c to use unlocked_ioctl
        pciehp: block new requests from the device before power off
        pciehp: workaround against Bad DLLP during power off
        pciehp: wait for 1000ms before LED operation after power off
        PCI: Remove pci_enable_device_bars() from documentation
        PCI: Remove pci_enable_device_bars()
        PCI: Remove users of pci_enable_device_bars()
        PCI: Add pci_enable_device_{io,mem} intefaces
        PCI: avoid save the same type of cap multiple times
        PCI: correctly initialize a structure for pcie_save_pcix_state()
        ...
      215e871a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · b6cf160c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (128 commits)
        USB: fix codingstyle issues in drivers/usb/core/*.c
        USB: fix codingstyle issues in drivers/usb/core/message.c
        USB: fix codingstyle issues in drivers/usb/core/hcd-pci.c
        USB: fix codingstyle issues in drivers/usb/core/devio.c
        USB: fix codingstyle issues in drivers/usb/core/devices.c
        USB: fix codingstyle issues in drivers/usb/core/*.h
        USB: fix codingstyle issues in include/linux/usb/
        USB: fix codingstyle issues in include/linux/usb.h
        USB: mark USB drivers as being GPL only
        USB: use a real vendor and product id for root hubs
        USB: mount options: fix usbfs
        USB: Fix usb_serial_driver structure for Kobil cardreader driver.
        usb: ehci should use u16 for isochronous intervals
        usb: ehci, remove false clear-reset path
        USB: Use menuconfig objects
        usb: ohci-sm501 driver
        usb: dma bounce buffer support
        USB: last abuses of intfdata in close for usb-serial drivers
        USB: kl5kusb105 don't flush to logically disconnected devices
        USB: oti6858: cleanup
        ...
      b6cf160c
    • P
      debug: softlockup looping fix · ed50d6cb
      Peter Zijlstra 提交于
      Rafael J. Wysocki reported weird, multi-seconds delays during
      suspend/resume and bisected it back to:
      
        commit 82a1fcb9
        Author: Ingo Molnar <mingo@elte.hu>
        Date:   Fri Jan 25 21:08:02 2008 +0100
      
            softlockup: automatically detect hung TASK_UNINTERRUPTIBLE tasks
      
      fix it:
      
       - restore the old wakeup mechanism
       - fix break usage in do_each_thread() { } while_each_thread().
       - fix the hotplug switch stmt, a fall-through case was broken.
      Bisected-by: NRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Tested-by: NRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ed50d6cb