David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 14:37:56 +00:00
..
ac97_codec.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
ad1816a.h
ad1848.h	[ALSA] Add dB scale information to ad1848 driver	2006-09-23 10:43:28 +02:00
ainstr_fm.h
ainstr_gf1.h
ainstr_iw.h
ainstr_simple.h
ak4xxx-adda.h	[ALSA] ak4xxx - Remove bogus IPGA controls	2006-09-23 10:46:55 +02:00
ak4114.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
ak4117.h
ak4531_codec.h
asequencer.h
asound_fm.h
asound.h	[ALSA] Control API - more robust TLV implementation	2006-09-23 10:37:26 +02:00
asoundef.h
control.h	[ALSA] Remove unused tlv_rw field from struct snd_kcontrol	2006-09-23 10:37:49 +02:00
core.h	Driver core: convert sound core to use struct device	2006-12-01 14:52:01 -08:00
cs46xx_dsp_scb_types.h
cs46xx_dsp_spos.h
cs46xx_dsp_task_types.h
cs46xx.h
cs4231.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
cs8403.h
cs8427.h
driver.h
emu10k1_synth.h
emu10k1.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
emu8000_reg.h
emu8000.h
emux_legacy.h
emux_synth.h
es1688.h
gus.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
hdsp.h
hdspm.h
hwdep.h
i2c.h
info.h	[ALSA] Fix disconnection of proc interface	2006-09-23 10:36:48 +02:00
initval.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
Kbuild
memalloc.h
minors.h
mixer_oss.h
mpu401.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
opl3.h
opl4.h
pcm_oss.h
pcm_params.h
pcm-indirect.h
pcm.h	[PATCH] maximum latency tracking: ALSA support	2006-10-01 00:39:19 -07:00
rawmidi.h
sb16_csp.h
sb.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
seq_device.h
seq_instr.h
seq_kernel.h
seq_midi_emul.h
seq_midi_event.h
seq_oss_legacy.h
seq_oss.h
seq_virmidi.h
sfnt_info.h
snd_wavefront.h
soundfont.h
sscape_ioctl.h
tea575x-tuner.h
tea6330t.h
timer.h	[ALSA] Unregister device files at disconnection	2006-09-23 10:36:58 +02:00
tlv.h	[ALSA] Add definition of TLV dB range compound	2006-09-23 10:46:11 +02:00
trident.h
typedefs.h
uda1341.h
util_mem.h
version.h	[ALSA] version 1.0.13	2006-11-28 15:07:33 +01:00
vx_core.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
wavefront_fx.h
wavefront.h
ymfpci.h