1
0
Fork 0
alistair23-linux/sound/drivers
Linus Torvalds bb758e9637 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimers: fix warning in kernel/hrtimer.c
  x86: make sure we really have an hpet mapping before using it
  x86: enable HPET on Fujitsu u9200
  linux/timex.h: cleanup for userspace
  posix-timers: simplify de_thread()->exit_itimers() path
  posix-timers: check ->it_signal instead of ->it_pid to validate the timer
  posix-timers: use "struct pid*" instead of "struct task_struct*"
  nohz: suppress needless timer reprogramming
  clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
  nohz: no softirq pending warnings for offline cpus
  hrtimer: removing all ur callback modes, fix
  hrtimer: removing all ur callback modes, fix hotplug
  hrtimer: removing all ur callback modes
  x86: correct link to HPET timer specification
  rtc-cmos: export second NVRAM bank

Fixed up conflicts in sound/drivers/pcsp/pcsp.c and sound/core/hrtimer.c
manually.
2008-12-30 16:16:21 -08:00
..
mpu401 [ALSA] Add MPU401_INFO_NO_ACK bitflag 2008-04-29 19:01:56 +02:00
opl3 ALSA: Kill snd_assert() in other places 2008-08-13 11:46:40 +02:00
opl4 ALSA: Kill snd_assert() in other places 2008-08-13 11:46:40 +02:00
pcsp Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-12-30 16:16:21 -08:00
vx ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule() 2008-12-18 12:17:55 +01:00
Kconfig ALSA: ac97 - Remove EXPERIMENTAL from CONFIG_SND_AC97_POWER_SAVE 2008-11-28 15:29:01 +01:00
Makefile [ALSA] Add PC-speaker sound driver 2008-04-24 12:00:20 +02:00
dummy.c ALSA: misc typo fixes 2008-10-19 10:36:08 +02:00
ml403-ac97cr.c sound: struct device - replace bus_id with dev_name(), dev_set_name() 2008-11-03 08:57:33 +01:00
mtpav.c ALSA: mtpav - Fix race in probe 2008-10-10 13:41:58 +02:00
mts64.c [ALSA] sound: fix mts64 section mismatches 2008-01-31 17:30:00 +01:00
pcm-indirect2.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
pcm-indirect2.h [ALSA] Xilinx ML403 AC97 Controller Reference device driver 2008-01-31 17:29:15 +01:00
portman2x4.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
serial-u16550.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
virmidi.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00