Linus Torvalds 4964e0664c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits) MIPS: Delete unused function add_temporary_entry. MIPS: Set default pci cache line size. MIPS: Flush huge TLB MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM. MIPS: Octeon: Add support for OCTEON II PCIe MIPS: Octeon: Update PCI Latency timer and enable more error reporting. MIPS: Alchemy: Update cpu-feature-overrides MIPS: Alchemy: db1200: Improve PB1200 detection. MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code. MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller MIPS: Alchemy: irq: register pm at irq init time MIPS: Alchemy: Touchscreen support on DB1100 MIPS: Alchemy: Hook up IrDA on DB1000/DB1100 net/irda: convert au1k_ir to platform driver. MIPS: Alchemy: remove unused board headers MTD: nand: make au1550nd.c a platform_driver MIPS: Netlogic: Mark Netlogic chips as SMT capable MIPS: Netlogic: Add support for XLP 3XX cores MIPS: Netlogic: Merge some of XLR/XLP wakup code MIPS: Netlogic: Add default XLP config. ... Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c, traps.c} and drivers/tty/serial/Makefile		2012-01-14 13:05:21 -08:00
..
aoa	Merge branch 'master' into for-next	2011-11-13 20:55:53 +01:00
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
atmel	ALSA: atmel/ac97c: using software reset instead hardware reset if not available	2011-12-19 11:27:41 +01:00
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
drivers	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
firewire	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
i2c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
isa	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
parisc	…
pci	module_param: avoid bool abuse, add bint for special cases.	2012-01-13 09:32:17 +10:30
pcmcia	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
soc	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-01-14 13:05:21 -08:00
sparc	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
spi	ALSA: atmel - update author email for ABDAC, AC97C and AT73C213	2011-06-28 16:56:07 +02:00
synth	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Makefile	ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver	2011-03-15 08:42:22 +01:00
ac97_bus.c	sound: Fixed line limit issue in sound/ac97_bus.c	2010-12-06 16:09:49 +01:00
last.c	…
sound_core.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
sound_firmware.c	sound: read i_size with i_size_read()	2011-03-18 15:14:57 +01:00