05 Jan, 2012

1 commit


04 Jan, 2012

2 commits

  • As pointed out by Joe Perches the SCM tree type was missing in my patch.

    Signed-off-by: Oliver Hartkopp

    CC: Oliver Hartkopp
    CC: Urs Thuermann
    CC: Wolfgang Grandegger
    CC: Marc Kleine-Budde
    CC: linux-can@vger.kernel.org

    Oliver Hartkopp
     
  • Update the CAN MAINTAINERS section:

    - point out active maintainers
    - pull the CAN driver discussion away from netdev ML
    - point to the new CAN web site on gitorious.org
    - add CAN development git repository URL to submit patches

    Signed-off-by: Oliver Hartkopp

    CC: Oliver Hartkopp
    CC: Urs Thuermann
    CC: Wolfgang Grandegger
    CC: Marc Kleine-Budde
    CC: linux-can@vger.kernel.org
    Signed-off-by: David S. Miller

    Oliver Hartkopp
     

31 Dec, 2011

1 commit


27 Dec, 2011

1 commit


25 Dec, 2011

1 commit


24 Dec, 2011

1 commit


21 Dec, 2011

1 commit

  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (31 commits)
    Revert "[media] af9015: limit I2C access to keep FW happy"
    [media] s5p-fimc: Fix camera input configuration in subdev operations
    [media] m5mols: Fix logic in sanity check
    [media] ati_remote: switch to single-byte scancodes
    [media] V4L: mt9m111: fix uninitialised mutex
    [media] V4L: omap1_camera: fix missing include
    [media] V4L: mt9t112: use after free in mt9t112_probe()
    [media] V4L: soc-camera: fix compiler warnings on 64-bit platforms
    [media] s5p_mfc_enc: fix s/H264/H263/ typo
    [media] omap_vout: Fix compile error in 3.1
    [media] au0828: add missing models 72101, 72201 & 72261 to the model matrix
    [media] au0828: add missing USB ID 2040:7213
    [media] au0828: add missing USB ID 2040:7260
    [media] [trivial] omap24xxcam-dma: Fix logical test
    [media] omap_vout: fix crash if no driver for a display
    [media] media: video: s5p-tv: fix build break
    [media] omap3isp: fix compilation of ispvideo.c
    [media] m5mols: Fix set_fmt to return proper pixel format code
    [media] s5p-fimc: Use correct fourcc for RGB565 colour format
    [media] s5p-fimc: Fail driver probing when sensor configuration is wrong
    ...

    Linus Torvalds
     

20 Dec, 2011

1 commit


18 Dec, 2011

1 commit


10 Dec, 2011

1 commit


09 Dec, 2011

2 commits

  • More players joined to memory cgroup developments and Johannes' great work
    changed internal design of memory cgroup dramatically. And he will do
    more works. Michal Hokko did many bug fixes and know memory cgroup very
    well. Daisuke Nishimura helped us very much but he seems busy now.
    Thanks to his works.

    Signed-off-by: KAMEZAWA Hiroyuki
    Acked-by: Michal Hocko
    Acked-by: Johannes Weiner
    Acked-by: Daisuke Nishimura
    Cc: Balbir Singh
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KAMEZAWA Hiroyuki
     
  • Commit 29b68415e335 ("x86: amd_iommu: move to drivers/iommu/")
    moved the files, update the patterns.

    CC: Ohad Ben-Cohen
    CC: Joerg Roedel

    Signed-off-by: Joe Perches
    Signed-off-by: Joerg Roedel

    Joe Perches
     

07 Dec, 2011

1 commit


06 Dec, 2011

1 commit

  • Update the six major subsystem trees hosted in the tip tree to
    the new location (or add the location if it was missing).

    Acked-by: Thomas Gleixner
    Signed-off-by: Peter Zijlstra
    Link: http://lkml.kernel.org/n/tip-w0z98as3kwy9bo1o3k2mmuvi@git.kernel.org
    Signed-off-by: Ingo Molnar

    Peter Zijlstra
     

04 Dec, 2011

1 commit

  • Open vSwitch is a multilayer Ethernet switch targeted at virtualized
    environments. In addition to supporting a variety of features
    expected in a traditional hardware switch, it enables fine-grained
    programmatic extension and flow-based control of the network.
    This control is useful in a wide variety of applications but is
    particularly important in multi-server virtualization deployments,
    which are often characterized by highly dynamic endpoints and the need
    to maintain logical abstractions for multiple tenants.

    The Open vSwitch datapath provides an in-kernel fast path for packet
    forwarding. It is complemented by a userspace daemon, ovs-vswitchd,
    which is able to accept configuration from a variety of sources and
    translate it into packet processing rules.

    See http://openvswitch.org for more information and userspace
    utilities.

    Signed-off-by: Jesse Gross

    Jesse Gross
     

03 Dec, 2011

1 commit


02 Dec, 2011

3 commits


01 Dec, 2011

1 commit

  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
    ARM: ux500: update defconfig
    ARM: u300: update defconfig
    ARM: at91: enable additional boards in existing soc defconfig files
    ARM: at91: refresh soc defconfig files for 3.2
    ARM: at91: rename defconfig files appropriately
    ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module
    ARM: OMAP2+: Remove empty io.h
    ARM: OMAP2: select ARM_AMBA if OMAP3_EMU is defined
    ARM: OMAP: smartreflex: fix IRQ handling bug
    ARM: OMAP: PM: only register TWL with voltage layer when device is present
    ARM: OMAP: hwmod: Fix the addr space, irq, dma count APIs
    arm: mx28: fix bit operation in clock setting
    ARM: imx: export imx_ioremap
    ARM: imx/mm-imx3: conditionally compile i.MX31 and i.MX35 code
    ARM: mx5: Fix checkpatch warnings in cpu-imx5.c
    MAINTAINERS: Add missing directory
    ARM: imx: drop 'ARCH_MX31' and 'ARCH_MX35'
    ARM: imx6q: move clock register map to machine_desc.map_io
    ARM: pxa168/gplugd: add the correct SSP device
    ARM: Update mach-types to fix mxs build breakage
    ...

    Linus Torvalds
     

29 Nov, 2011

2 commits

  • Arnd Bergmann
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (28 commits)
    ALSA: hda - Fix jack-detection control of VT1708
    ALSA: hda - cut and paste typo in cs420x_models[]
    ALSA: hda/realtek - Minor cleanup
    ALSA: hda/realtek - Fix missing inits of item indices for auto-mic
    ALSA: hda - Fix invalid pin and GPIO for Apple laptops with CS codecs
    ALSA: hda - Check subdevice mask in snd_hda_check_board_codec_sid_config()
    ALSA: hda - fail ELD reading early
    ALSA: lx6464es - fix device communication via command bus
    ALSA: lx6464es - command buffer API cleanup
    ALSA: hda - repoll ELD content for multiple times
    ALSA: hdspm - Fix PCI ID for PCIe RME MADI cards
    ASoC: Ensure WM8731 register cache is synced when resuming from disabled
    ALSA: cs5535 - Fix an endianness conversion
    ASoC: cs4271: Fix wrong mask parameter in some snd_soc_update_bits calls
    ASoC: wm_hubs: fix DB_RANGE size
    ASoC: wm9090: fix DB_RANGE size
    ASoC: wm8993: fix DB_RANGE size
    ASoC: wm8962: fix DB_RANGE size
    ASoC: sgtl5000: fix DB_RANGE size
    ASoC: rt5631: fix DB_RANGE size
    ...

    Linus Torvalds
     

25 Nov, 2011

1 commit


24 Nov, 2011

1 commit


22 Nov, 2011

4 commits

  • arch/arm/mach-imx/ is part of the i.MX support. Add it.

    Signed-off-by: Sascha Hauer

    Sascha Hauer
     
  • * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    TTY: ldisc, wait for ldisc infinitely in hangup
    TTY: ldisc, move wait idle to caller
    TTY: ldisc, allow waiting for ldisc arbitrarily long
    Revert "tty/serial: Prevent drop of DCD on suspend for Tegra UARTs"
    RS485: fix inconsistencies in the meaning of some variables
    pch_uart: Fix DMA resource leak issue
    serial,mfd: Fix CMSPAR setup
    tty/serial: Prevent drop of DCD on suspend for Tegra UARTs
    pch_uart: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
    pch_uart: Support new device LAPIS Semiconductor ML7831 IOH
    pch_uart: Fix hw-flow control issue
    tty: hvc_dcc: Fix duplicate character inputs
    jsm: Change maintainership

    Linus Torvalds
     
  • * 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    misc: ad525x_dpot: Fix AD8400 spi transfer size.
    pch_phub: Fix MAC address writing issue for LAPIS ML7831
    pch_phub: Improve ADE(Address Decode Enable) control
    pch_phub: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
    pch_phub: Support new device LAPIS Semiconductor ML7831 IOH
    pcie-gadget-spear: Add "platform:" prefix for platform modalias
    MAINTAINERS: add CHAR and MISC driver maintainers

    Linus Torvalds
     
  • The forcedeth changes had a conflict with the conversion over
    to atomic u64 statistics in net-next.

    The libertas cfg.c code had a conflict with the bss reference
    counting fix by John Linville in net-next.

    Conflicts:
    drivers/net/ethernet/nvidia/forcedeth.c
    drivers/net/wireless/libertas/cfg.c

    David S. Miller
     

21 Nov, 2011

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)
    ipv4: fix redirect handling
    ping: dont increment ICMP_MIB_INERRORS
    sky2: fix hang in napi_disable
    sky2: enforce minimum ring size
    bonding: Don't allow mode change via sysfs with slaves present
    f_phonet: fix page offset of first received fragment
    stmmac: fix pm functions avoiding sleep on spinlock
    stmmac: remove spin_lock in stmmac_ioctl.
    stmmac: parameters auto-tuning through HW cap reg
    stmmac: fix advertising 1000Base capabilties for non GMII iface
    stmmac: use mdelay on timeout of sw reset
    sky2: version 1.30
    sky2: used fixed RSS key
    sky2: reduce default Tx ring size
    sky2: rename up/down functions
    sky2: pci posting issues
    sky2: fix hang on shutdown (and other irq issues)
    r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
    MAINTAINERS: change email address for shemminger
    pch_gbe: Move #include of module.h
    ...

    Linus Torvalds
     

19 Nov, 2011

4 commits


17 Nov, 2011

1 commit


16 Nov, 2011

3 commits

  • * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: lantiq: use export.h in favour of module.h
    MAINTAINERS: The MIPS git tree has moved.
    MIPS: Fix build error due to missing inclusion of .
    MIPS: ASID conflict after CPU hotplug
    MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c
    MIPS: errloongson2_clock: Fix build error by including linux/module.h
    STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct change
    MIPS: Hook up process_vm_readv and process_vm_writev system calls.
    MIPS: Kernel hangs occasionally during boot.
    MIPS: Octeon: Mark SMP-IPI interrupt as IRQF_NO_THREAD
    MIPS: BCM47xx: fix build with GENERIC_GPIO configuration
    MIPS: NXP: Remove unused source files.
    MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check

    Linus Torvalds
     
  • As discussed at Kernel Summit(2011), new cgroups mailing list is opened
    by James. This list is for discussing general cgroup design and patches
    including all subsystems and for getting more attentions to
    cgroups/namespaces related issues by developpers.

    Signed-off-by: KAMEZAWA Hiroyuki
    Cc: James Bottomley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KAMEZAWA Hiroyuki
     
  • Breno Leitao has passed the maintainership on to me.

    Signed-off-by: Lucas Kannebley Tavares
    Acked-by: Breno Leitao
    Signed-off-by: Greg Kroah-Hartman

    Lucas Kannebley Tavares
     

15 Nov, 2011

1 commit


14 Nov, 2011

1 commit