AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
b39c48fac1
kernel_optimize_test/sound/soc/codecs
History
Linus Torvalds 76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c
2011-03-24 09:50:13 -07:00
..
88pm860x-codec.c ASoC: Yet more x86 tracepoint workarounds 2010-12-29 13:06:18 +00:00
88pm860x-codec.h
ac97.c
ad193x.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
ad193x.h
ad1836.c
ad1836.h
ad1980.c
ad1980.h
ad73311.c
ad73311.h
ads117x.c
ads117x.h
ak4104.c ASoC: Remove module probe announcements from CODEC drivers 2011-03-01 23:30:40 +00:00
ak4535.c
ak4535.h
ak4642.c ASoC: ak4642: add SND_SOC_DAIFMT_FORMAT support 2011-01-21 19:01:46 +00:00
ak4671.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
ak4671.h
alc5623.c
alc5623.h
cq93vc.c asoc: davinci_voicecodec: use mfd_data instead of driver_data 2011-03-23 10:41:56 +01:00
cs42l51.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
cs42l51.h
cs4270.c ASoC: Constify i2c_device_id table 2011-03-07 11:46:01 +00:00
cs4271.c ASoC: Manage mode and rate bits correctly for CS4271 CODEC. 2011-03-09 13:08:16 +00:00
cx20442.c ASoC: CX20442: fix wrong reg_cache_default content 2011-02-11 11:00:30 +00:00
cx20442.h
da7210.c
dfbmcs320.c ASoC: Add driver for the dfbmcs320 bluetooth module 2011-03-07 12:20:01 +00:00
dmic.c ASoC: DMIC codec: Adding a generic DMIC codec 2011-01-12 00:48:45 +00:00
jz4740.c
Kconfig Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
l3.c
lm4857.c ASoC: neo1973_wm8753: Move lm4857 specefic code to its own module 2011-03-07 12:19:22 +00:00
Makefile ASoC: Add MAX9850 codec driver 2011-03-11 12:01:44 +00:00
max9850.c ASoC: Fix spacing in MAX8950 2011-03-11 12:07:31 +00:00
max9850.h ASoC: Add MAX9850 codec driver 2011-03-11 12:01:44 +00:00
max9877.c
max9877.h
max98088.c Merge branch 'for-2.6.38' into for-2.6.39 2011-01-19 11:22:54 +00:00
max98088.h
pcm3008.c
pcm3008.h
sgtl5000.c ASoC: Support !REGULATOR build for sgtl5000 2011-03-22 18:26:30 +00:00
sgtl5000.h ASoC: remove unnecessary header including in SGTL5000 codec driver 2011-02-28 14:24:35 +00:00
sn95031.c ASoC: sn95031: fix the amic tlv scale 2011-02-15 17:58:54 -08:00
sn95031.h ASoC: sn95031: Add support for reading mic bias 2011-02-09 22:32:53 +00:00
spdif_transciever.c
ssm2602.c
ssm2602.h
stac9766.c
stac9766.h
tlv320aic3x.c Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38 2010-12-17 17:37:28 +00:00
tlv320aic3x.h
tlv320aic23.c
tlv320aic23.h
tlv320aic26.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
tlv320aic26.h
tlv320aic32x4.c ASoC: Fix outdated API usage in tlv320aic32x4 2011-03-07 11:13:42 +00:00
tlv320aic32x4.h ASoC: Add TI tlv320aic32x4 codec support. 2011-03-04 18:21:08 +00:00
tlv320dac33.c ASoC: tlv320dac33: add MODULE_DEVICE_TABLE 2011-03-07 11:45:53 +00:00
tlv320dac33.h
tpa6130a2.c ASoC: tpa6130a2: Fix compiler warning 2011-01-12 00:53:03 +00:00
tpa6130a2.h
twl4030.c mfd: mfd_cell is now implicitly available to twl4030 drivers 2011-03-23 10:41:54 +01:00
twl6040.c ASoC: Staticise twl6040_hs_jack_report() 2011-01-21 16:44:44 +00:00
twl6040.h
uda134x.c ASoC: mini2440: Fix uda134x codec problem. 2011-03-11 12:17:11 +00:00
uda134x.h
uda1380.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
uda1380.h
wl1273.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
wl1273.h ASoC: WL1273 FM radio: Fix breakage with MFD API changes 2011-01-14 12:29:40 +00:00
wm2000.c ASoC: Move WM2000 to dev_pm_ops 2011-02-25 12:58:36 +00:00
wm2000.h
wm8350.c ASoC: Yet more x86 tracepoint workarounds 2010-12-29 13:06:18 +00:00
wm8350.h
wm8400.c asoc: wm8400-codec: Use mfd_data instead of driver_data 2011-03-23 10:41:56 +01:00
wm8400.h
wm8510.c
wm8510.h
wm8523.c ASoC: Avoid direct register cache access when setting defaults 2011-01-17 13:59:39 +00:00
wm8523.h
wm8580.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
wm8580.h
wm8711.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
wm8711.h
wm8727.c
wm8728.c
wm8728.h
wm8731.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
wm8731.h
wm8737.c
wm8737.h
wm8741.c ASoC: Avoid direct register cache access when setting defaults 2011-01-17 13:59:39 +00:00
wm8741.h
wm8750.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
wm8750.h
wm8753.c ASoC: codecs: wm8753: Fix DAI mode switching 2011-02-07 12:02:49 +00:00
wm8753.h
wm8770.c
wm8770.h
wm8776.c
wm8776.h
wm8804.c ASoC: Update users of readable_register()/volatile_register() 2011-01-13 14:17:43 +00:00
wm8804.h
wm8900.c ASoC: Update users of readable_register()/volatile_register() 2011-01-13 14:17:43 +00:00
wm8900.h
wm8903.c Merge branch 'for-2.6.38' into for-2.6.39 2011-02-13 19:51:04 +00:00
wm8903.h Merge branch 'for-2.6.38' into for-2.6.39 2011-02-22 10:38:13 -08:00
wm8904.c ASoC: Avoid direct register cache access when setting defaults 2011-01-17 13:59:39 +00:00
wm8904.h
wm8940.c Merge branch 'for-2.6.37' into for-2.6.38 2010-12-28 23:42:53 +00:00
wm8940.h
wm8955.c ASoC: Avoid direct register cache access when setting defaults 2011-01-17 13:59:39 +00:00
wm8955.h
wm8960.c Merge branch 'for-2.6.37' into for-2.6.38 2010-12-28 23:42:53 +00:00
wm8960.h
wm8961.c ASoC: Update users of readable_register()/volatile_register() 2011-01-13 14:17:43 +00:00
wm8961.h
wm8962.c ASoC: Accept any logical value for WM8962 GPIO set() 2011-01-31 16:07:12 +00:00
wm8962.h
wm8971.c Merge branch 'for-2.6.37' into for-2.6.38 2010-12-28 23:42:53 +00:00
wm8971.h
wm8974.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
wm8974.h
wm8978.c ASoC: Fix broken bitfield definitions in WM8978 2011-03-09 12:32:50 +00:00
wm8978.h
wm8985.c
wm8985.h
wm8988.c ASoC: codecs: Remove unused reg_cache fields from device structs 2010-12-28 23:37:21 +00:00
wm8988.h
wm8990.c ASoC: WM8990: msleep() takes milliseconds not jiffies 2011-01-17 14:09:44 +00:00
wm8990.h
wm8991.c ASoC: WM8991: Add initial WM8991 driver 2011-01-17 13:50:20 +00:00
wm8991.h ASoC: WM8991: Add initial WM8991 driver 2011-01-17 13:50:20 +00:00
wm8993.c ASoC: Update users of readable_register()/volatile_register() 2011-01-13 14:17:43 +00:00
wm8993.h
wm8994-tables.c ASoC: Fix section mismatch warnings in WM8994 2011-03-08 18:56:11 +00:00
wm8994.c Merge branch 'for-2.6.38' into for-2.6.39 2011-03-10 14:16:35 +00:00
wm8994.h ASoC: Fix section mismatch warnings in WM8994 2011-03-08 18:56:11 +00:00
wm8995.c Merge branch 'for-2.6.38' into for-2.6.39 2011-01-19 14:50:22 +00:00
wm8995.h ASoC: Remove WM8995 write sequencer bitfield definitions 2010-12-24 11:32:45 +00:00
wm9081.c ASoC: Simplify WM9081 speaker startup by using widgets for spaker output 2011-03-09 12:23:03 +00:00
wm9081.h
wm9090.c ASoC: Avoid direct register cache access when setting defaults 2011-01-17 13:59:39 +00:00
wm9090.h
wm9705.c
wm9705.h
wm9712.c
wm9712.h
wm9713.c
wm9713.h
wm_hubs.c ASoC: Hook wm_hubs micbiases up to CLK_SYS 2011-02-22 10:37:49 -08:00
wm_hubs.h