OpenCloudOS-Kernel/arch/arm/mach-s3c64xx
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 Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
Kconfig Board-level changes 2012-01-09 14:37:41 -08:00
Makefile Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
clock.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
common.c 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
common.h 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
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c Merge branch 'samsung/board' into next/boards 2011-12-16 14:56:37 -08:00
mach-crag6410.c 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-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
pm.c Board-level changes 2012-01-09 14:37:41 -08:00
s3c6400.c 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
s3c6410.c 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
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped 2010-10-25 16:04:33 +09:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-spi.c ARM: S3C64XX: Modified files for SPI consolidation work 2011-12-23 10:50:00 +09:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00