08 Nov, 2011

4 commits

  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits)
    ARM: OMAP: Fix export.h or module.h includes
    ARM: OMAP: omap_device: Include linux/export.h
    ARM: OMAP2: Fix H4 matrix keyboard warning
    ARM: OMAP1: Remove unused omap-alsa.h
    ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
    ARM: OMAP2+: timer: Remove omap_device_pm_latency
    ARM: OMAP2+: clock data: Remove redundant timer clkdev
    ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio
    ARM: OMAP: usb: musb: OMAP: Delete unused function
    MAINTAINERS: Update linux-omap git repository
    ARM: OMAP: change get_context_loss_count ret value to int
    ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly
    ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF
    ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list
    ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success
    ARM: OMAP: dmtimer: Include linux/module.h
    ARM: OMAP2+: l3-noc: Include linux/module.h
    ARM: OMAP2+: devices: Fixes for McPDM
    ARM: OMAP: Fix errors and warnings when building for one board
    ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only
    ...

    Linus Torvalds
     
  • Tony Lindgren
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
    forcedeth: fix a few sparse warnings (variable shadowing)
    forcedeth: Improve stats counters
    forcedeth: remove unneeded stats updates
    forcedeth: Acknowledge only interrupts that are being processed
    forcedeth: fix race when unloading module
    MAINTAINERS/rds: update maintainer
    wanrouter: Remove kernel_lock annotations
    usbnet: fix oops in usbnet_start_xmit
    ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
    etherh: Add MAINTAINERS entry for etherh
    bonding: comparing a u8 with -1 is always false
    sky2: fix regression on Yukon Optima
    netlink: clarify attribute length check documentation
    netlink: validate NLA_MSECS length
    i825xx:xscale:8390:freescale: Fix Kconfig dependancies
    macvlan: receive multicast with local address
    tg3: Update version to 3.121
    tg3: Eliminate timer race with reset_task
    tg3: Schedule at most one tg3_reset_task run
    tg3: Obtain PCI function number from device
    ...

    Linus Torvalds
     
  • update for the actual maintainer

    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    Or Gerlitz
     

06 Nov, 2011

1 commit


05 Nov, 2011

2 commits


04 Nov, 2011

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
    be2net: Add detect UE feature for Lancer
    be2net: Prevent CQ full condition for Lancer
    be2net: Fix disabling multicast promiscous mode
    be2net: Fix endian issue in RX filter command
    af_packet: de-inline some helper functions
    MAINTAINERS: Add can-gw include to maintained files
    net: Add back alignment for size for __alloc_skb
    net: add missing bh_unlock_sock() calls
    l2tp: fix race in l2tp_recv_dequeue()
    ixgbevf: Update release version
    ixgbe: DCB, return max for IEEE traffic classes
    ixgbe: fix reading of the buffer returned by the firmware
    ixgbe: Fix compiler warnings
    ixgbe: fix smatch splat due to missing NULL check
    ixgbe: fix disabling of Tx laser at probe
    ixgbe: Fix link issues caused by a reset while interface is down
    igb: Fix for I347AT4 PHY cable length unit detection
    e100: make sure vlan support isn't advertised on old adapters
    e1000e: demote a debugging WARN to a debug log message
    net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
    ...

    Linus Torvalds
     
  • Commit c1aabdf379bc2feeb0df7057ed5bad96f492133e (can-gw: add netlink based
    CAN routing) added a new include file that's neither referenced by any of
    the CAN maintainers.

    Signed-off-by: Oliver Hartkopp
    Signed-off-by: David S. Miller

    Oliver Hartkopp
     

03 Nov, 2011

4 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock:
    hwspinlock: add MAINTAINERS entries
    hwspinlock/omap: omap_hwspinlock_remove should be __devexit
    hwspinlock/u8500: add hwspinlock driver
    hwspinlock/core: register a bank of hwspinlocks in a single API call
    hwspinlock/core: remove stubs for register/unregister
    hwspinlock/core: use a mutex to protect the radix tree
    hwspinlock/core/omap: fix id issues on multiple hwspinlock devices
    hwspinlock/omap: simplify allocation scheme
    hwspinlock/core: simplify 'owner' handling
    hwspinlock/core: simplify Kconfig

    Fix up trivial conflicts (addition of omap_hwspinlock_pdata, removal of
    omap_spinlock_latency) in arch/arm/mach-omap2/hwspinlock.c

    Also, do an "evil merge" to fix a compile error in omap_hsmmc.c which
    for some reason was reported in the same email thread as the "please
    pull hwspinlock changes".

    Linus Torvalds
     
  • * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (21 commits)
    MAINTAINERS: add an entry for Edac Sandy Bridge driver
    edac: tag sb_edac as EXPERIMENTAL, as it requires more testing
    EDAC: Fix incorrect edac mode reporting in sb_edac
    edac: sb_edac: Add it to the building system
    edac: Add an experimental new driver to support Sandy Bridge CPU's
    i7300_edac: Fix error cleanup logic
    i7core_edac: Initialize memory name with cpu, channel, bank
    i7core_edac: Fix compilation on 32 bits arch
    i7core_edac: scrubbing fixups
    EDAC: Correct Kconfig dependencies
    i7core_edac: return -ENODEV if no MC is found
    i7core_edac: use edac's own way to print errors
    MAINTAINERS: remove dropped edac_mce.* from the file
    i7core_edac: Drop the edac_mce facility
    x86, MCE: Use notifier chain only for MCE decoding
    EDAC i7core: Use mce socketid for better compatibility
    i7core_edac: Don't enable memory scrubbing for Xeon 35xx
    i7core_edac: Add scrubbing support
    edac: Move edac main structs to include/linux/edac.h
    i7core_edac: Fix oops when trying to inject errors
    ...

    Linus Torvalds
     
  • * 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
    MAINTAINERS: Update entry for IA64
    [IA64] gpio: GENERIC_GPIO default must be n
    [IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where needed
    [IA64] agp/hp-agp: Allow binding user memory to the AGP GART
    [IA64] sn2: add missing put_cpu()

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    udf: Cleanup metadata flags handling
    udf: Skip mirror metadata FE loading when metadata FE is ok
    ext3: Allow quota file use root reservation
    udf: Remove web reference from UDF MAINTAINERS entry
    quota: Drop path reference on error exit from quotactl
    udf: Neaten udf_debug uses
    udf: Neaten logging output, use vsprintf extension %pV
    udf: Convert printks to pr_
    udf: Rename udf_warning to udf_warn
    udf: Rename udf_error to udf_err
    udf: Promote some debugging messages to udf_error
    ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY.
    udf: Add readpages support for udf.
    ext3/balloc.c: local functions should be static
    ext2: fix the outdated comment in ext2_nfs_get_inode()
    ext3: remove deprecated oldalloc
    fs/ext3/balloc.c: delete useless initialization
    fs/ext2/balloc.c: delete useless initialization
    ext3: fix message in ext3_remount for rw-remount case
    ext3: Remove i_mutex from ext3_sync_file()

    Fix up trivial (printf format cleanup) conflicts in fs/udf/udfdecl.h

    Linus Torvalds
     

02 Nov, 2011

3 commits

  • * 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
    MAINTAINERS: add ARM/FREESCALE IMX6 entry
    arm/imx: merge i.MX3 and i.MX6
    arm/imx6q: add suspend/resume support
    arm/imx6q: add device tree machine support
    arm/imx6q: add smp and cpu hotplug support
    arm/imx6q: add core drivers clock, gpc, mmdc and src
    arm/imx: add gic_handle_irq function
    arm/imx6q: add core definitions and low-level debug uart
    arm/imx6q: add device tree source
    ARM: highbank: add suspend support
    ARM: highbank: Add cpu hotplug support
    ARM: highbank: add SMP support
    MAINTAINERS: add Calxeda Highbank ARM platform
    ARM: add Highbank core platform support
    ARM: highbank: add devicetree source
    ARM: l2x0: add empty l2x0_of_init
    picoxcell: add a definition of VMALLOC_END
    picoxcell: remove custom ioremap implementation
    picoxcell: add the DTS for the PC7302 board
    picoxcell: add the DTS for pc3x2 and pc3x3 devices
    ...

    Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
    conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
    by Arnd).

    Linus Torvalds
     
  • Conflicts:
    Documentation/devicetree/bindings/arm/fsl.txt
    arch/arm/Kconfig
    arch/arm/Kconfig.debug
    arch/arm/plat-mxc/include/mach/common.h

    Arnd Bergmann
     
  • Conflicts:
    arch/arm/mach-mxs/include/mach/gpio.h
    arch/arm/mach-omap2/board-generic.c
    arch/arm/plat-mxc/include/mach/gpio.h

    Arnd Bergmann
     

01 Nov, 2011

13 commits

  • This is the fifth version of the patchset (with one tiny whitespace fix)
    to the Linux kernel to support the Qualcomm Hexagon architecture.

    Between now and the next pull requests, Richard Kuo should have his key
    signed, etc., and should be back on kernel.org. In the meantime, this
    got merged as a emailed patch-series.

    * Hexagon: (36 commits)
    Add extra arch overrides to asm-generic/checksum.h
    Hexagon: Add self to MAINTAINERS
    Hexagon: Add basic stacktrace functionality for Hexagon architecture.
    Hexagon: Add configuration and makefiles for the Hexagon architecture.
    Hexagon: Comet platform support
    Hexagon: kgdb support files
    Hexagon: Add page-fault support.
    Hexagon: Add page table header files & etc.
    Hexagon: Add ioremap support
    Hexagon: Provide DMA implementation
    Hexagon: Implement basic TLB management routines for Hexagon.
    Hexagon: Implement basic cache-flush support
    Hexagon: Provide basic implementation and/or stubs for I/O routines.
    Hexagon: Add user access functions
    Hexagon: Add locking types and functions
    Hexagon: Add SMP support
    Hexagon: Provide basic debugging and system trap support.
    Hexagon: Add ptrace support
    Hexagon: Add time and timer functions
    Hexagon: Add interrupts
    ...

    Linus Torvalds
     
  • Signed-off-by: Richard Kuo
    Acked-by: Arnd Bergmann
    Signed-off-by: Linus Torvalds

    Richard Kuo
     
  • Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • Marc Boucher, James Morris and Rusty Russell were crucial in the
    early netfilter days. We thank them all!

    However, they are not actively maintaining netfilter anymore.

    This patch adds myself as netfilter maintainer.

    Signed-off-by: Pablo Neira Ayuso

    Pablo Neira Ayuso
     
  • Quoth Andrew:

    - Most of MM. Still waiting for the poweroc guys to get off their
    butts and review some threaded hugepages patches.

    - alpha

    - vfs bits

    - drivers/misc

    - a few core kerenl tweaks

    - printk() features

    - MAINTAINERS updates

    - backlight merge

    - leds merge

    - various lib/ updates

    - checkpatch updates

    * akpm: (127 commits)
    epoll: fix spurious lockdep warnings
    checkpatch: add a --strict check for utf-8 in commit logs
    kernel.h/checkpatch: mark strict_strto and simple_strto as obsolete
    llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
    wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
    fat: follow rename pack_hex_byte() to hex_byte_pack()
    security: follow rename pack_hex_byte() to hex_byte_pack()
    kgdb: follow rename pack_hex_byte() to hex_byte_pack()
    lib: rename pack_hex_byte() to hex_byte_pack()
    lib/string.c: fix strim() semantics for strings that have only blanks
    lib/idr.c: fix comment for ida_get_new_above()
    lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
    lib/bitmap.c: quiet sparse noise about address space
    lib/spinlock_debug.c: print owner on spinlock lockup
    lib/kstrtox: common code between kstrto*() and simple_strto*() functions
    drivers/leds/leds-lp5521.c: check if reset is successful
    leds: turn the blink_timer off before starting to blink
    leds: save the delay values after a successful call to blink_set()
    drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
    drivers/leds/leds-lm3530.c: add __devexit_p where needed
    ...

    Linus Torvalds
     
  • Since achieving the full ASLR by merging the PIE randomization in commit
    cc503c1b43 ("x86: PIE executable randomization"), I have been dealing with
    most (if not all) of the bugreports reported against userspace address
    space randomization, so it might be a good idea to provide a decent
    contact point in MAINTAINERS.

    Signed-off-by: Jiri Kosina
    Cc: Josh Boyer
    Cc: Nicolas Pitre
    Cc: Ingo Molnar
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Kosina
     
  • While ego surfing, I noticed an email address problem.

    Signed-off-by: Linas Vepstas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linas Vepstas
     
  • Signed-off-by: Ike Panhc
    Cc: Matthew Garrett
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ike Panhc
     
  • In the move of the lis3 driver, the hp_accel.c file got dropped from the
    MAINTAINER file. Make it explicit again that this file is tied to lis3
    again.

    Signed-off-by: Éric Piel
    Cc: Matthew Garrett
    Cc: Witold Pilat
    Cc: Lyall Pearce
    Cc: Malte Starostik
    Cc: Ilkka Koskinen
    Cc: Thadeu Lima de Souza Cascardo
    Cc: Christian Lamparter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Éric Piel
     
  • * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (45 commits)
    acer-wmi: replaced the hard coded bitmap by the communication devices bitmap from SMBIOS
    acer-wmi: check the existence of internal wireless device when set capability
    acer-wmi: add ACER_WMID_v2 interface flag to represent new notebooks
    sony-laptop:irq: Remove IRQF_DISABLED
    asus-laptop: Add rfkill support for Pegatron Lucid tablet
    asus-laptop: pega_accel - Report accelerometer orientation change through udev
    asus-laptop: fix module description
    asus-laptop: hide leds on Pegatron Lucid
    asus-laptop: Pegatron Lucid accelerometer
    asus-laptop: allow boot time control of Pegatron ALS sensor
    Platform: samsung_laptop: add support for X520 machines.
    platform: samsung_laptop: add dmi information for Samsung R700 laptops
    hp_accel: Add axis-mapping for HP ProBook / EliteBook
    hp_accel: Add a new PNP id
    WMI: properly cleanup devices to avoid crashes
    ideapad: remove sysfs node for cfg
    ideapad: add debugfs support
    ideapad: add event for Novo key
    ideapad: change parameter of ideapad_sync_rfk_state
    ideapad: define vpc commands
    ...

    Linus Torvalds
     
  • Web link in UDF MAINTAINERS entry doesn't work and I don't use SF for UDF
    development (and don't see a point to start using it). So just remove the link.

    Reported-by: Joe Perches
    Signed-off-by: Jan Kara

    Jan Kara
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
    [media] pctv452e: Remove bogus code
    [media] adv7175: Make use of media bus pixel codes
    [media] media: vb2: fix incorrect return value
    [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
    [media] cx23885: Stop the risc video fifo before reconfiguring it
    [media] cx23885: Avoid incorrect error handling and reporting
    [media] cx23885: Avoid stopping the risc engine during buffer timeout
    [media] cx23885: Removed a spurious function cx23885_set_scale()
    [media] cx23885: v4l2 api compliance, set the audioset field correctly
    [media] cx23885: hook the audio selection functions into the main driver
    [media] cx23885: add generic functions for dealing with audio input selection
    [media] cx23885: fixes related to maximum number of inputs and range checking
    [media] cx23885: Initial support for the MPX-885 mini-card
    [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
    [media] cx23885: Enable audio line in support from the back panel
    [media] cx23885: Allow the audio mux config to be specified on a per input basis
    [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
    [media] cx23885: Name an internal i2c part and declare a bitfield by name
    [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
    [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
    ...

    Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
    file rename vs add)

    Linus Torvalds
     

31 Oct, 2011

3 commits

  • It adds maintainer for ARM/FREESCALE IMX6.

    Signed-off-by: Shawn Guo

    Shawn Guo
     
  • Adding maintainer for arch/arm/mach-highbank/

    Signed-off-by: Rob Herring
    Reviewed-by: Jamie Iles
    Reviewed-by: Shawn Guo

    Rob Herring
     
  • * 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
    video: platinumfb: Add __devexit_p at necessary place
    drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
    drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
    drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
    drivers/video: fsl-diu-fb: remove unused panel operating mode support
    drivers/video: fsl-diu-fb: use an enum for the AOI index
    drivers/video: fsl-diu-fb: add several new video modes
    drivers/video: fsl-diu-fb: remove broken screen blanking support
    drivers/video: fsl-diu-fb: move some definitions out of the header file
    drivers/video: fsl-diu-fb: fix some ioctls
    video: da8xx-fb: Increased resolution configuration of revised LCDC IP
    OMAPDSS: picodlp: add missing #include
    fb: fix au1100fb bitrot.
    mx3fb: fix NULL pointer dereference in screen blanking.
    video: irq: Remove IRQF_DISABLED
    smscufx: change edid data to u8 instead of char
    OMAPDSS: DISPC: zorder support for DSS overlays
    OMAPDSS: DISPC: VIDEO3 pipeline support
    OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
    video/omap: fix build dependencies
    ...

    Fix up conflicts in:
    - drivers/staging/xgifb/XGI_main_26.c
    Changes to XGIfb_pan_var()
    - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
    Removed (or in the case of apollon.c, merged into the generic
    DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)

    Linus Torvalds
     

29 Oct, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
    ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
    ALSA: hda - Keep EAPD turned on for old Conexant chips
    ALSA: hda/realtek - Fix missing volume controls with ALC260
    ASoC: wm8940: Properly set codec->dapm.bias_level
    ALSA: hda - Fix pin-config for ASUS W90V
    ALSA: hda - Fix surround/CLFE headphone and speaker pins order
    ALSA: hda - Fix typo
    ALSA: Update the sound git tree URL
    ALSA: HDA: Add new revision for ALC662
    ASoC: max98095: Convert codec->hw_write to snd_soc_write
    ASoC: keep pointer to resource so it can be freed
    ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
    ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
    ASoC: da7210: Add support for line out and DAC
    ASoC: da7210: Add support for DAPM
    ALSA: hda/realtek - Fix DAC assignments of multiple speakers
    ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
    ASoC: Set sgtl5000->ldo in ldo_regulator_register
    ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
    ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
    ...

    Linus Torvalds
     

27 Oct, 2011

2 commits

  • Takashi Iwai
     
  • * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
    of_mdio: Don't phy_scan_fixups() twice
    Devicetree: Expand on ARM Primecell binding documentation
    dt: Add empty of_match_node() macro
    dt: add empty dt helpers for non-dt build
    devicetree: fix build error on drivers/tty/serial/altera_jtaguart.c
    devicetree: Add ARM pl022 spi controller binding doc
    devicetree: Add ARM pl061 gpio controller binding doc
    of/irq: of_irq_find_parent: check for parent equal to child
    MAINTAINERS: update devicetree maintainers
    dt: add helper to read 64-bit integers
    tty: use of_match_ptr() for of_match_table entry
    OF: Add of_match_ptr() macro
    dt: add empty for_each_child_of_node, of_find_property
    devicetree: Document Qualcomm and Atmel prefixes
    serial/imx: add of_alias_get_id() reference back
    dt: add of_alias_scan and of_alias_get_id
    devicetree: Add a registry of vendor prefixes

    Linus Torvalds
     

26 Oct, 2011

1 commit

  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
    staging: et131x: Remove redundant check and return statement
    staging: et131x: Mainly whitespace changes to appease checkpatch
    staging: et131x: Remove last of the forward declarations
    staging: et131x: Remove even more forward declarations
    staging: et131x: Remove yet more forward declarations
    staging: et131x: Remove more forward declarations
    staging: et131x: Remove forward declaration of et131x_adapter_setup
    staging: et131x: Remove some forward declarations
    staging: et131x: Remove unused rx_ring.recv_packet_pool
    staging: et131x: Remove call to find pci pm capability
    staging: et131x: Remove redundant et131x_reset_recv() call
    staging: et131x: Remove unused rx_ring.recv_buffer_pool
    Staging: bcm: Fix three initialization errors in InterfaceDld.c
    Staging: bcm: Fix coding style issues in InterfaceDld.c
    staging:iio:dac: Add AD5360 driver
    staging:iio:trigger:bfin-timer: Fix compile error
    Staging: vt6655: add some range checks before memcpy()
    Staging: vt6655: whitespace fixes to iotcl.c
    Staging: vt6656: add some range checks before memcpy()
    Staging: vt6656: whitespace cleanups in ioctl.c
    ...

    Fix up conflicts in:
    - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
    vg driver movement
    - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
    driver removal vs now stale changes
    - drivers/staging/rtl8192e/r8192E_core.c:
    driver removal vs now stale changes
    - drivers/staging/et131x/et131*:
    driver consolidation into one file, tried to do fixups

    Linus Torvalds
     

25 Oct, 2011

4 commits

  • * 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
    PM / Clocks: Remove redundant NULL checks before kfree()
    PM / Documentation: Update docs about suspend and CPU hotplug
    ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
    ARM: mach-shmobile: sh7372 A4R support (v4)
    ARM: mach-shmobile: sh7372 A3SP support (v4)
    PM / Sleep: Mark devices involved in wakeup signaling during suspend
    PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
    PM / Hibernate: Do not initialize static and extern variables to 0
    PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
    PM / Hibernate: Add resumedelay kernel param in addition to resumewait
    MAINTAINERS: Update linux-pm list address
    PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
    PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
    PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
    PM / Hibernate: Fix typo in a kerneldoc comment
    PM / Hibernate: Freeze kernel threads after preallocating memory
    PM: Update the policy on default wakeup settings
    PM / VT: Cleanup #if defined uglyness and fix compile error
    PM / Suspend: Off by one in pm_suspend()
    PM / Hibernate: Include storage keys in hibernation image on s390
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
    pinctrl/sirf: fix sirfsoc_get_group_pins prototype
    pinctrl: Don't copy function name when requesting a pin
    pinctrl: Don't copy pin names when registering them
    pinctrl: Remove unsafe __refdata
    pinctrl: get_group_pins() const fixes
    pinctrl: add a driver for the CSR SiRFprimaII pinmux
    pinctrl: add a driver for the U300 pinmux
    drivers: create a pin control subsystem

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
    dp83640: free packet queues on remove
    dp83640: use proper function to free transmit time stamping packets
    ipv6: Do not use routes from locally generated RAs
    |PATCH net-next] tg3: add tx_dropped counter
    be2net: don't create multiple RX/TX rings in multi channel mode
    be2net: don't create multiple TXQs in BE2
    be2net: refactor VF setup/teardown code into be_vf_setup/clear()
    be2net: add vlan/rx-mode/flow-control config to be_setup()
    net_sched: cls_flow: use skb_header_pointer()
    ipv4: avoid useless call of the function check_peer_pmtu
    TCP: remove TCP_DEBUG
    net: Fix driver name for mdio-gpio.c
    ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
    rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
    ipv4: fix ipsec forward performance regression
    jme: fix irq storm after suspend/resume
    route: fix ICMP redirect validation
    net: hold sock reference while processing tx timestamps
    tcp: md5: add more const attributes
    Add ethtool -g support to virtio_net
    ...

    Fix up conflicts in:
    - drivers/net/Kconfig:
    The split-up generated a trivial conflict with removal of a
    stale reference to Documentation/networking/net-modules.txt.
    Remove it from the new location instead.
    - fs/sysfs/dir.c:
    Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
    with Eric Biederman's changes for tagged directories.

    Linus Torvalds
     
  • * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
    usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
    usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
    USB: gadget: midi: memory leak in f_midi_bind_config()
    USB: gadget: midi: fix range check in f_midi_out_open()
    QE/FHCI: fixed the CONTROL bug
    usb: renesas_usbhs: tidyup for smatch warnings
    USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
    EHCI: workaround for MosChip controller bug
    usb: gadget: file_storage: fix race on unloading
    USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
    USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
    USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
    USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
    USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
    USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
    usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
    USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
    USB: Fix runtime wakeup on OHCI
    xHCI/USB: Make xHCI driver have a BOS descriptor.
    usb: gadget: add new usb gadget for ACM and mass storage
    ...

    Linus Torvalds