korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
728765b30a
linux/sound/soc/atmel
History
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_ssc_dai.c ASoC: make ops a pointer in 'struct snd_soc_dai' 2009-03-04 22:29:47 +00:00
atmel_ssc_dai.h ALSA: ASoC: email - update email addresses. 2009-02-03 07:05:23 +01:00
atmel-pcm.c ASoC: Staticise PCM operations tables 2009-01-19 16:23:27 +00:00
atmel-pcm.h ASoC: Merge AT91 and AVR32 support into a single atmel architecture 2008-10-31 13:12:26 +00:00
Kconfig ASoC: AFEB9260 driver 2009-05-08 19:14:34 +01:00
Makefile ASoC: AFEB9260 driver 2009-05-08 19:14:34 +01:00
playpaq_wm8510.c ASoC: correct print specifiers for unsigneds 2009-05-28 10:20:26 +01:00
sam9g20_wm8731.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-09-14 17:48:14 -07:00
snd-soc-afeb9260.c ASoC: AFEB9260 driver 2009-05-08 19:14:34 +01:00