kevin/linux
1
Fork 0
Code
7f65e924c0
linux/sound/isa
History
Jiri Kosina e75d660672 Merge branch 'master' into for-next 
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c
2012-04-08 21:48:52 +02:00
..
ad1816a ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
ad1848 ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
cs423x ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
es1688 ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
galaxy ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
gus ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
msnd ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
opti9xx ALSA: fix isa/opti9xx module param type 2012-03-29 17:57:08 +02:00
sb ALSA: emu8000: Remove duplicate linux/moduleparam.h include from emu8000_patch.c 2012-02-06 10:22:54 +01:00
wavefront ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
wss sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
adlib.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
als100.c Email/web address change 2012-03-28 10:35:15 +02:00
azt2320.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
cmi8330.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
es18xx.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
Kconfig ALSA: ISA: Remove snd-sgalaxy 2010-08-13 13:02:20 +02:00
Makefile ALSA: ISA: Remove snd-sgalaxy 2010-08-13 13:02:20 +02:00
opl3sa2.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
sc6000.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
sscape.c sound: fix drivers needing module.h not moduleparam.h 2011-10-31 19:31:19 -04:00