1. 03 2月, 2012 13 次提交
  2. 02 2月, 2012 4 次提交
  3. 01 2月, 2012 13 次提交
  4. 31 1月, 2012 10 次提交
    • M
      489773c2
    • M
      ASoC: fsi: Remove unneeded empty runtime PM callbacks · bc122e34
      Mark Brown 提交于
      The runtime PM core no longer requires any callbacks so don't provide
      empty ones for it any more.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      bc122e34
    • M
      ASoC: max9768: Fix up review comments in max9768 driver · 69edea8a
      Mark Brown 提交于
      The Mute Switch should be called Playback Switch to match the volume
      and the regmap core has been updated so we don't need to mark all the
      registers as non-volatile.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: NWolfram Sang <w.sang@pengutronix.de>
      69edea8a
    • L
      Merge branch 'hwmon-for-linus' of... · c5d2bc11
      Linus Torvalds 提交于
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
        hwmon: (sht15) fix bad error code
        MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
        MAINTAINERS: Add hwmon entries for Wolfson
        hwmon: (f71805f) Fix clamping of temperature limits
      c5d2bc11
    • L
      Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8e2a2880
      Linus Torvalds 提交于
      Here are some fixes to the pin control system that has accumulated since
      -rc1.  Mainly Tony Lindgren fixed the module load/unload logic and the
      rest are minor fixes and documentation.
      
      * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: add checks for empty function names
        pinctrl: fix pinmux_hog_maps when ctrl_dev_name is not set
        pinctrl: fix some pinmux typos
        pinctrl: free debugfs entries when unloading a pinmux driver
        pinctrl: unbreak error messages
        Documentation/pinctrl: fix a few syntax errors in code examples
        pinctrl: fix pinconf_pins_show iteration
      8e2a2880
    • L
      Merge tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 27ba234c
      Linus Torvalds 提交于
      Here are some tty/serial patches for 3.3-rc1
      
      Big thing here is the movement of the 8250 serial drivers to their own
      directory, now that the patch churn has calmed down.
      
      Other than that, only minor stuff (omap patches were reverted as they
      were found to be wrong), and another broken driver removed from the
      system.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      * tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: Kill off Moorestown code
        Revert "tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode"
        Revert "tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip"
        serial: Fix wakeup init logic to speed up startup
        docbook: don't use serial_core.h in device-drivers book
        serial: amba-pl011: lock console writes against interrupts
        amba-pl011: do not disable RTS during shutdown
        tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip
        tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode
        omap-serial: make serial_omap_restore_context depend on CONFIG_PM_RUNTIME
        omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP.
        TTY: fix UV serial console regression
        jsm: Fixed EEH recovery error
        Updated TTY MAINTAINERS info
        serial: group all the 8250 related code together
      27ba234c
    • W
      ASoC: max9768: add driver for max9768 amplifier · 394d2bba
      Wolfram Sang 提交于
      Add a driver supporting the volume control and the mute pin. Shdn pin
      and DAPM are not taken care of yet.
      Signed-off-by: NWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      394d2bba
    • L
      Merge tag 'usb-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 6bc2b95e
      Linus Torvalds 提交于
      Here are a bunch of USB patches for 3.3-rc1.
      
      Nothing major, largest thing here is the removal of some drivers that
      did not work at all.  Other than that, the normal collection of bugfixes
      and new device ids.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      * tag 'usb-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (52 commits)
        uwb & wusb: fix kconfig error
        USB: Realtek cr: fix autopm scheduling while atomic
        USB: ftdi_sio: Add more identifiers
        xHCI: Cleanup isoc transfer ring when TD length mismatch found
        usb: musb: omap2430: minor cleanups.
        qcaux: add more Pantech UML190 and UML290 ports
        Revert "drivers: usb: Fix dependency for USB_HWA_HCD"
        usb: mv-otg - Fix build if CONFIG_USB is not set
        USB: cdc-wdm: Avoid hanging on interface with no USB_CDC_DMM_TYPE
        usb: add support for STA2X11 host driver
        drivers: usb: Fix dependency for USB_HWA_HCD
        kernel-doc: fix new warning in usb.h
        USB: OHCI: fix new compiler warnings
        usb: serial: kobil_sct: fix compile warning:
        drivers/usb/host/ehci-fsl.c: add missing iounmap
        USB: cdc-wdm: better allocate a buffer that is at least as big as we tell the USB core
        USB: cdc-wdm: call wake_up_all to allow driver to shutdown on device removal
        USB: cdc-wdm: use two mutexes to allow simultaneous read and write
        USB: cdc-wdm: updating desc->length must be protected by spin_lock
        USB: usbsevseg: fix max length
        ...
      6bc2b95e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · a14a8d93
      Linus Torvalds 提交于
      1) Setting link attributes can modify the size of the attributes that
         would be reported on a subsequent getlink netlink operation,
         therefore min_ifinfo_dump_size needs to be adjusted.  From Stefan
         Gula.
      
      2) Resegmentation of TSO frames while trimming can violate invariants
         expected by callers, namely that the number of segments can only stay
         the same or decrease, never increase.  If MSS changes, however, we
         can trim data but then end up with more segments.  Fix this by only
         segmenting to the MSS already recorded in the SKB.  That's the
         simplest fix for now and if we want to get more fancy in the future
         that's a more involved change.
      
         This probably explains some retransmit counter inaccuracies.
      
         From Neal Cardwell.
      
      3) Fix too-many-wakeups in POLL with AF_UNIX sockets, from Eric Dumazet.
      
      4) Fix CAIF crashes wrt.  namespace handling.  From Eric Dumazet and
         Eric W. Biederman.
      
      5) TCP port selection fixes from Flavio Leitner.
      
      6) More socket memory cgroup build fixes in certain randonfig
         situations.  From Glauber Costa.
      
      7) Fix TCP memory sysctl regression reported by Ingo Molnar, also from
         Glauber Costa.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        af_unix: fix EPOLLET regression for stream sockets
        tcp: fix tcp_trim_head() to adjust segment count with skb MSS
        net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL
        net caif: Register properly as a pernet subsystem.
        netns: Fail conspicously if someone uses net_generic at an inappropriate time.
        net: explicitly add jump_label.h header to sock.h
        net: RTNETLINK adjusting values of min_ifinfo_dump_size
        ipv6: Fix ip_gre lockless xmits.
        xen-netfront: correct MAX_TX_TARGET calculation.
        netns: fix net_alloc_generic()
        tcp: bind() optimize port allocation
        tcp: bind() fix autoselection to share ports
        l2tp: l2tp_ip - fix possible oops on packet receive
        iwlwifi: fix PCI-E transport "inta" race
        mac80211: set bss_conf.idle when vif is connected
        mac80211: update oper_channel on ibss join
      a14a8d93
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · b527a233
      Linus Torvalds 提交于
      This fixes an integration issue with the regulator device tree bindings
      which shook out in -rc.  The bindings were overly enthusiatic when
      deciding to set a voltage on a regulator and would try to set zero volts
      on an unconfigured regulator which isn't supported.
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Set apply_uV only when min and max voltages are defined
      b527a233