linux-sg2042/sound/soc
Linus Torvalds 2ca7d674d7 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
  [ARM] Update mach-types
  ARM: 5636/1: Move vendor enum to AMBA include
  ARM: Fix pfn_valid() for sparse memory
  [ARM] orion5x: Add LaCie NAS 2Big Network support
  [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
  ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
  ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
  ARM: 5689/1: Update default config of HP Jornada 700-series machines
  ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
  ARM: 5688/1: ks8695_serial: disable_irq() lockup
  ARM: 5687/1: fix an oops with highmem
  ARM: 5684/1: Add nuc960 platform to w90x900
  ARM: 5683/1: Add nuc950 platform to w90x900
  ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
  ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
  ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
  MMC: MMCI: convert realview MMC to use gpiolib
  ARM: 5685/1: Make MMCI driver compile without gpiolib
  ARM: implement highpte
  ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
  ...

Fix up trivial conflict in arch/arm/kernel/signal.c.

It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
2009-09-14 17:48:14 -07:00
..
atmel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
au1x ASoC: au1x: PSC-AC97 bugfixes 2009-09-08 19:21:27 +01:00
blackfin ASoC: new board driver to connect bfin-5xx with ad1836 codec 2009-09-01 11:36:13 +01:00
codecs Merge branch 'topic/asoc' into for-linus 2009-09-10 15:32:40 +02:00
davinci ASoC: davinci: i2c device creation moved into board files 2009-08-28 10:33:10 +01:00
fsl Merge branch 'topic/asoc' into for-linus 2009-09-10 15:32:40 +02:00
imx ASoC: Staticise unexported variables 2009-08-15 11:36:49 +01:00
omap ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI 2009-08-28 18:36:43 +01:00
pxa ASoC: Pass correct platform data from pxa2xx-ac97 2009-08-23 18:18:01 +01:00
s3c24xx Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
s6000 ASoC: tlv320aic3x: fixup board device changes 2009-08-21 10:52:57 +01:00
sh ASoC: Add FSI-AK4642 sound support for SuperH 2009-08-21 11:02:03 +01:00
txx9 ASoC: txx9aclc: dynamically allocate dmaengine devname 2009-06-25 21:06:30 +01:00
Kconfig ASoC: Hook i.MX into build 2009-08-15 11:37:30 +01:00
Makefile Merge branch 'for-2.6.32' into mxc 2009-08-15 11:20:44 +01:00
soc-cache.c ASoC: fix I2C build errors 2009-08-11 10:47:25 +01:00
soc-core.c ASoC: Add DAPM widget power decision debugfs files 2009-08-21 17:17:59 +01:00
soc-dapm.c Merge branch 'topic/digital-mixing' into for-2.6.32 2009-08-24 20:44:41 +01:00
soc-jack.c ASoC: jack: Fix race in snd_soc_jack_add_gpios 2009-07-31 22:38:43 +01:00