黄涛 35b9b535e7 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" ... This reverts commit 6e2688ca84, reversing changes made to 4b7c9de4de. Conflicts: drivers/gpio/wm831x-gpio.c drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/airo.c drivers/net/wireless/ath/ar9170/hw.h drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/usb.c drivers/net/wireless/ath/ath5k/ath5k.h drivers/net/wireless/ath/ath5k/attach.c drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/qcu.c drivers/net/wireless/ath/ath5k/reset.c drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/eeprom.h drivers/net/wireless/ath/ath9k/eeprom_def.c drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/initvals.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/pci.c drivers/net/wireless/ath/ath9k/phy.h drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/xmit.c drivers/net/wireless/ath/regd.h drivers/net/wireless/b43/Kconfig drivers/net/wireless/b43/Makefile drivers/net/wireless/b43/b43.h drivers/net/wireless/b43/dma.c drivers/net/wireless/b43/main.c drivers/net/wireless/b43/pio.c drivers/net/wireless/b43/pio.h drivers/net/wireless/b43/xmit.c drivers/net/wireless/b43legacy/main.c drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/hostap/hostap_hw.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_wlan.h drivers/net/wireless/iwlwifi/iwl-3945.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-dev.h drivers/net/wireless/iwlwifi/iwl-helpers.h drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/libertas/if_sdio1.c drivers/net/wireless/p54/eeprom.c drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/txrx.c drivers/net/wireless/rndis_wlan.c drivers/net/wireless/rtl818x/rtl8180_dev.c drivers/net/wireless/wl12xx/wl1251_debugfs.c drivers/net/wireless/wl12xx/wl1251_sdio.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2011-07-30 16:24:52 +08:00
..
aoa	ALSA: Don't assume i2c device probing always succeeds	2009-10-01 07:46:33 +02:00
arm	ALSA: AACI: fix recording bug	2009-11-30 14:50:55 +01:00
atmel	ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4	2009-04-06 03:56:28 +02:00
core	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
drivers	ALSA: dummy - Fix descriptions of pcm_substreams parameter	2009-11-02 14:11:55 +01:00
i2c	V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API	2009-03-30 12:43:02 -03:00
isa	Merge branch 'topic/cmi8330' into for-linus	2009-09-10 15:32:45 +02:00
mips	sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer	2010-01-06 15:03:26 -08:00
oss	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:11:20 +08:00
parisc	ALSA: sound/parisc: Move dereference after NULL test	2009-10-30 12:01:38 +01:00
pci	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
pcmcia	sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer	2010-01-06 15:03:26 -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	ALSA: snd-aica: declare MODULE_FIRMWARE	2009-11-08 09:13:51 +01:00
soc	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
sparc	ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers	2009-04-28 15:06:44 +02:00
spi
synth	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
usb	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
ac97_bus.c
Kconfig	sound: make OSS device number claiming optional and schedule its removal	2009-08-10 13:59:36 +02:00
last.c
Makefile
sound_core.c	Driver-Core: extend devnode callbacks to provide permissions	2009-09-19 12:50:38 -07:00
sound_firmware.c