黄涛 67450b3bb6 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Merge v3.0.59
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
	drivers/usb/serial/option.c

2013-01-21 17:21:19 +08:00

..

aoa

Revert wrong fixes for common misspellings

2011-04-26 23:31:11 -07:00

arm

ALSA: pxa27x: fix ac97 cold reset

2013-01-17 08:44:08 -08:00

atmel

ALSA: atmel - update author email for ABDAC, AC97C and AT73C213

2011-06-28 16:56:07 +02:00

core

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-12-01 12:07:55 +08:00

drivers

ALSA: aloop - add locking to timer access

2012-10-13 05:28:10 +09:00

firewire

ALSA: isight: adjust for new queueing API

2011-06-17 11:37:29 +02:00

i2c

ALSA: tea575x: use better card and bus names

2011-05-13 19:43:24 +02:00

isa

Fix common misspellings

2011-03-31 11:26:23 -03:00

mips

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

oss

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

parisc

ALSA: sound/parisc: Move dereference after NULL test

2009-10-30 12:01:38 +01:00

pci

ALSA: hda - Add support for Realtek ALC292

2012-12-03 12:59:15 -08:00

pcmcia

ALSA: pcmcia - Use pcmcia_request_irq()

2012-12-03 12:59:12 -08:00

ppc

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

sh

sound: sh: ctrl_in/outX to __raw_read/writeX conversion.

2010-10-27 15:53:50 +09:00

soc

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2013-01-21 17:21:19 +08:00

sparc

dt/sound: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:44 -07:00

spi

ALSA: atmel - update author email for ABDAC, AC97C and AT73C213

2011-06-28 16:56:07 +02:00

synth

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

usb

ALSA: usb-audio: Fix missing autopm for MIDI input

2013-01-11 09:03:37 -08:00

ac97_bus.c

sound: Fixed line limit issue in sound/ac97_bus.c

2010-12-06 16:09:49 +01:00

Kconfig

ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver

2011-03-15 08:42:22 +01:00

last.c

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00

Makefile

ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver

2011-03-15 08:42:22 +01:00

sound_core.c

sound: Use sound_register_*() for additional OSS minor devices

2011-03-09 20:10:37 +01:00

sound_firmware.c

sound: read i_size with i_size_read()

2011-03-18 15:14:57 +01:00