Eric Lee / smarc-fsl-linux-kernel

16 Aug, 2010

1 commit

  • 1b68c9596   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: sound/usb/format: silence uninitialized variable warnings
    MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices
    MAINTAINERS: Make Wolfson entry also cover CODEC drivers
    ASoC: Only tweak WM8994 chip configuration on devices up to rev D
    ASoC: Optimise DSP performance for WM8994
    ALSA: hda - Fix dynamic ADC change working again
    ALSA: hda - Restrict PCM parameters per ELD information over HDMI
    sound: oss: sh_dac_audio.c removed duplicated #include

    Linus Torvalds
     

15 Aug, 2010

3 commits

13 Aug, 2010

2 commits

12 Aug, 2010

1 commit

  • 636d17427   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
    ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
    ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
    ARM: 6322/1: imx/pca100: Fix name of spi platform data
    ARM: 6321/1: fix syntax error in main Kconfig file
    ARM: 6297/1: move U300 timer to dynamic clock lookup
    ARM: 6296/1: clock U300 intcon and timer properly
    ARM: 6295/1: fix U300 apb_pclk split
    ARM: 6306/1: fix inverted MMC card detect in U300
    ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
    ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
    ARM: 6292/1: coresight: add ETM management registers
    ARM: 6288/1: ftrace: document mcount formats
    ARM: 6287/1: ftrace: clean up mcount assembly indentation
    ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
    ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
    ARM: 6280/1: imx: Fix build failure when including without
    ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
    ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
    ARM: S5PV210: Override FIMC driver name on Aquila board
    ARM: S5PC100: enable FIMC on SMDKC100
    ...

    Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
    different subsystem 'setname' calls, and trivial port types in
    include/linux/serial_core.h

    Linus Torvalds
     

11 Aug, 2010

2 commits

  • 0b019a415   Merge branches 'master' and 'devel' into for-linus ... Browse Code »

    Conflicts:
    arch/arm/Kconfig
    arch/arm/mm/Kconfig

    Russell King
     
  • 7ae0dea90   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... Browse Code »

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (94 commits)
    V4L/DVB: tvp7002: fix write to H-PLL Feedback Divider LSB register
    V4L/DVB: dvb: siano: free spinlock before schedule()
    V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()
    V4L/DVB: drivers: usbvideo: remove custom implementation of hex_to_bin()
    V4L/DVB: Report supported QAM modes on bt8xx
    V4L/DVB: media: ir-keytable: null dereference in debug code
    V4L/DVB: ivtv: convert to the new control framework
    V4L/DVB: ivtv: convert gpio subdev to new control framework
    V4L/DVB: wm8739: convert to the new control framework
    V4L/DVB: cs53l32a: convert to new control framework
    V4L/DVB: wm8775: convert to the new control framework
    V4L/DVB: cx2341x: convert to the control framework
    V4L/DVB: cx25840: convert to the new control framework
    V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config
    V4L/DVB: saa717x: convert to the new control framework
    V4L/DVB: msp3400: convert to the new control framework
    V4L/DVB: saa7115: convert to the new control framework
    V4L/DVB: v4l2: hook up the new control framework into the core framework
    V4L/DVB: Documentation: add v4l2-controls.txt documenting the new controls API
    V4L/DVB: v4l2-ctrls: Whitespace cleanups
    ...

    Linus Torvalds
     

10 Aug, 2010

25 commits

09 Aug, 2010

5 commits

  • 054d5c923   Merge branch 'devel-stable' into devel Browse Code »
    Russell King
     
  • 931e39a13   V4L/DVB: IR: Port ene driver to new IR subsystem and enable it ... Browse Code »

    Signed-off-by: Maxim Levitsky
    Signed-off-by: Mauro Carvalho Chehab

    Maxim Levitsky
     
  • 45d7f32c7   Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    arch/tile: check kmalloc() result
    arch/tile: catch up on various minor cleanups.
    arch/tile: avoid erroneous error return for PTRACE_POKEUSR.
    tile: set ARCH_KMALLOC_MINALIGN
    tile: remove homegrown L1_CACHE_ALIGN macro
    arch/tile: Miscellaneous cleanup changes.
    arch/tile: Split the icache flush code off to a generic header.
    arch/tile: Fix bug in support for atomic64_xx() ops.
    arch/tile: Shrink the tile-opcode files considerably.
    arch/tile: Add driver to enable access to the user dynamic network.
    arch/tile: Enable more sophisticated IRQ model for 32-bit chips.
    Move list types from to .
    Add wait4() back to the set of syscalls.
    Revert adding some arch-specific signal syscalls to .
    arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent(). Feedback from fujita.tomonori@lab.ntt.co.jp.
    arch/tile: core support for Tilera 32-bit chips.
    Fix up the "generic" unistd.h ABI to be more useful.

    Linus Torvalds
     
  • 4fd6c6bf8   Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra ... Browse Code »

    * 'for-linus' of git://android.kernel.org/kernel/tegra:
    [ARM] tegra: add MAINTAINERS entry
    [ARM] tegra: harmony: Add harmony board file
    [ARM] tegra: add pinmux support
    [ARM] tegra: add GPIO support
    [ARM] tegra: Add timer support
    [ARM] tegra: SMP support
    [ARM] tegra: Add clock support
    [ARM] tegra: Add IRQ support
    [ARM] tegra: initial tegra support

    Linus Torvalds
     
  • c5f347579   Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6 ... Browse Code »

    * 'for-linus' of git://github.com/schandinat/linux-2.6:
    drivers/video/via/via-gpio.c: fix warning
    viafb: Depends on X86
    fbdev: section cleanup in viafb driver
    viafb: fix accel_flags check_var bug
    viafb: probe cleanups
    viafb: remove ioctls which break the framebuffer interface
    viafb: update fix before calculating depth
    viafb: PLL value cleanup
    viafb: simplify lcd size "detection"
    viafb: fix PCI table
    viafb: add lcd scaling support for some IGPs
    viafb: improve lcd code readability
    viafb: remove duplicated scaling code
    MAINTAINERS: update viafb entry

    Linus Torvalds
     

08 Aug, 2010

1 commit

  • 2d5305697   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (82 commits)
    firewire: core: add forgotten dummy driver methods, remove unused ones
    firewire: add isochronous multichannel reception
    firewire: core: small clarifications in core-cdev
    firewire: core: remove unused code
    firewire: ohci: release channel in error path
    firewire: ohci: use memory barriers to order descriptor updates
    tools/firewire: nosy-dump: increment program version
    tools/firewire: nosy-dump: remove unused code
    tools/firewire: nosy-dump: use linux/firewire-constants.h
    tools/firewire: nosy-dump: break up a deeply nested function
    tools/firewire: nosy-dump: make some symbols static or const
    tools/firewire: nosy-dump: change to kernel coding style
    tools/firewire: nosy-dump: work around segfault in decode_fcp
    tools/firewire: nosy-dump: fix it on x86-64
    tools/firewire: add userspace front-end of nosy
    firewire: nosy: note ioctls in ioctl-number.txt
    firewire: nosy: use generic printk macros
    firewire: nosy: endianess fixes and annotations
    firewire: nosy: annotate __user pointers and __iomem pointers
    firewire: nosy: fix device shutdown with active client
    ...

    Linus Torvalds