kernel_optimize_test/arch/arm/mach-tegra
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
..
include/mach
board-dt-tegra20.c
board-dt-tegra30.c
board-harmony-pcie.c
board-harmony-pinmux.c
board-harmony-power.c
board-harmony.c
board-harmony.h
board-paz00-pinmux.c
board-paz00.c
board-paz00.h
board-pinmux.c
board-pinmux.h
board-seaboard-pinmux.c
board-seaboard.c
board-seaboard.h
board-trimslice-pinmux.c
board-trimslice.c
board-trimslice.h
board.h
clock.c
clock.h
common.c
cpu-tegra.c
devices.c
devices.h
dma.c
fuse.c
fuse.h
gpio-names.h
headsmp.S
hotplug.c
io.c
irq.c
Kconfig
localtimer.c
Makefile
Makefile.boot
pcie.c
pinmux-tegra20-tables.c
pinmux-tegra30-tables.c
pinmux.c
platsmp.c
powergate.c
tegra2_clocks.c
tegra2_emc.c
tegra2_emc.h
timer.c
usb_phy.c