Linus Torvalds
a429638cac
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
ALSA: usb-audio: add Yamaha MOX6/MOX8 support
ALSA: virtuoso: add S/PDIF input support for all Xonars
ALSA: ice1724 - Support for ooAoo SQ210a
ALSA: ice1724 - Allow card info based on model only
ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
ALSA: hdspm - Provide unique driver id based on card serial
ASoC: Dynamically allocate the rtd device for a non-empty release()
ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
ALSA: hda/cirrus - support for iMac12,2 model
ASoC: cx20442: add bias control over a platform provided regulator
ALSA: usb-audio - Avoid flood of frame-active debug messages
ALSA: snd-usb-us122l: Delete calls to preempt_disable
mfd: Put WM8994 into cache only mode when suspending
...
Fix up trivial conflicts in:
- arch/arm/mach-s3c64xx/mach-crag6410.c:
renamed speyside_wm8962 to tobermory, added littlemill right
next to it
- drivers/base/regmap/{regcache.c,regmap.c}:
duplicate diff that had already come in with other changes in
the regmap tree
2012-01-12 08:00:30 -08:00
..
boot
power management changes for omap and imx
2012-01-09 14:39:59 -08:00
common
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
configs
SH/R-Mobile updates for 3.3 merge window.
2012-01-11 23:29:20 -08:00
include /asm
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
kernel
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
lib
mach-at91
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-bcmring
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-clps711x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-cns3xxx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-davinci
MTD pull for 3.3
2012-01-10 13:45:22 -08:00
mach-dove
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ebsa110
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-ep93xx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-exynos
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2012-01-11 18:53:33 -08:00
mach-footbridge
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-gemini
mach-h720x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-highbank
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-imx
power management changes for omap and imx
2012-01-09 14:39:59 -08:00
mach-integrator
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-iop13xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-iop32x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-iop33x
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-ixp4xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ixp23xx
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ixp2000
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-kirkwood
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-ks8695
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-l7200/include /mach
mach-lpc32xx
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-mmp
Merge branch 'samsung/driver' into next/drivers
2012-01-09 16:16:29 +00:00
mach-msm
timer changes for msm
2012-01-09 14:40:48 -08:00
mach-mv78xx0
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-mx5
power management changes for omap and imx
2012-01-09 14:39:59 -08:00
mach-mxs
clock management changes for i.MX
2012-01-09 14:44:15 -08:00
mach-netx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-nomadik
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-omap1
New feature development
2012-01-09 14:38:51 -08:00
mach-omap2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-orion5x
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-picoxcell
New feature development
2012-01-09 14:38:51 -08:00
mach-pnx4008
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-prima2
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-pxa
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-realview
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-rpc
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-s3c64xx
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-s3c2410
Device tree conversions for samsung and tegra
2012-01-09 14:28:38 -08:00
mach-s3c2412
Device tree conversions for samsung and tegra
2012-01-09 14:28:38 -08:00
mach-s3c2416
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
mach-s3c2440
Board-level changes
2012-01-09 14:37:41 -08:00
mach-s3c2443
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-s5p64x0
Driver specific changes
2012-01-09 14:39:22 -08:00
mach-s5pc100
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
mach-s5pv210
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
mach-sa1100
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-shark
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-shmobile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-spear3xx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-spear6xx
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mach-tegra
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
mach-u300
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2012-01-10 10:19:57 -08:00
mach-ux500
New feature development
2012-01-09 14:38:51 -08:00
mach-versatile
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-vexpress
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-vt8500
mach-w90x900
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
mach-zynq
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
mm
lib: use generic pci_iomap on all architectures
2012-01-10 18:04:27 -08:00
nwfpe
oprofile
plat-iop
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
plat-mxc
power management changes for omap and imx
2012-01-09 14:39:59 -08:00
plat-nomadik
plat-omap
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2012-01-11 18:53:33 -08:00
plat-orion
New feature development
2012-01-09 14:38:51 -08:00
plat-pxa
plat-s3c24xx
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
plat-s5p
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
plat-samsung
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-01-10 10:55:52 -08:00
plat-spear
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
plat-versatile
tools
vfp
Kconfig
lib: use generic pci_iomap on all architectures
2012-01-10 18:04:27 -08:00
Kconfig-nommu
Kconfig.debug
Makefile
arm: Remove TCC subarch from Kconfig/Makefile
2012-01-05 13:33:59 +01:00