黄涛 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
..
platform	ACPI: don't cond_resched if irq is disabled	2010-01-28 15:00:26 -08:00
acexcep.h	ACPICA: Fix parameter validation for acpi_read/write	2009-03-26 16:38:25 -04:00
acnames.h	ACPICA: update Intel copyright	2008-04-23 23:00:13 -04:00
acoutput.h	ACPICA: Restructure includes into public/private	2008-12-31 01:15:40 -05:00
acpi_bus.h	ACPI: remove acpi_device_uid() and related stuff	2009-09-25 15:09:49 -04:00
acpi_drivers.h	Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release	2009-06-24 01:19:50 -04:00
acpi_numa.h	ACPI: misc cleanups	2008-02-07 03:33:23 -05:00
acpi.h	ACPICA: Restructure includes into public/private	2008-12-31 01:15:40 -05:00
acpiosxf.h	ACPICA: fix leak of acpi_os_validate_address	2009-08-27 13:10:35 -04:00
acpixf.h	ACPICA: Update version to 20090903.	2009-09-08 22:28:34 -04:00
acrestyp.h	ACPICA: Restructure includes into public/private	2008-12-31 01:15:40 -05:00
actbl.h	ACPICA: ACPI 4: Update headers for new and changed ACPI tables.	2009-08-28 19:40:38 -04:00
actbl1.h	ACPICA: Fix typo for HEST ACPI table	2009-08-28 19:40:39 -04:00
actbl2.h	ACPICA: ACPI 4: Update headers for new and changed ACPI tables.	2009-08-28 19:40:38 -04:00
actypes.h	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-09-23 09:32:11 -07:00
button.h	ACPI: make ACPI button funcs no-ops if not built in	2009-09-17 14:48:23 -07:00
container.h
pdc_intel.h	ACPI: Enable bit 11 in _PDC to advertise hw coord	2009-02-07 00:41:14 -05:00
processor.h	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
reboot.h	Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.	2008-07-16 23:27:08 +02:00
video.h	ACPI: Add the reference count to avoid unloading ACPI video bus twice	2009-06-23 23:38:41 -04:00