黄涛 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
..
ttm	drm/ttm: Fix build failure due to missing struct page	2009-12-18 14:04:42 -08:00
drm_cache.h	drm/ttm: consolidate cache flushing code in one place.	2009-08-27 09:53:47 +10:00
drm_core.h
drm_crtc_helper.h	drm/fb: add setcmap and fix 8-bit support.	2009-10-05 10:00:59 +10:00
drm_crtc.h	drm/kms: start adding command line interface using fb.	2009-09-25 13:08:20 +10:00
drm_edid.h	drm: Fix shifts which were miscalculated when converting from bitfields.	2009-06-24 16:11:04 +10:00
drm_encoder_slave.h	drm/kms: no need to return void value (encoder)	2009-08-19 16:06:49 +10:00
drm_fb_helper.h	drm/fb: add more correct 8/16/24/32 bpp fb support.	2009-10-06 13:54:01 +10:00
drm_hashtab.h	drm: include kernel list header file in hashtab header	2009-06-12 15:56:34 +10:00
drm_memory.h	includecheck fix: include/drm, drm_memory.h	2009-09-20 16:02:58 +05:30
drm_mm.h	drm: include seq_file.h for debugfs builds.	2009-09-08 11:32:08 +10:00
drm_mode.h	drm: clarify scaling property names	2009-08-19 16:06:40 +10:00
drm_os_linux.h	drm/i915: add i915_lp_ring_sync helper	2010-02-23 07:37:53 -08:00
drm_pciids.h	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
drm_sarea.h	drm: move to kref per-master structures.	2008-12-29 17:47:22 +10:00
drm_sman.h
drm_sysfs.h	drm: Enable drm drivers to add drm sysfs devices.	2009-08-19 16:08:51 +10:00
drm.h	make drm headers use strict integer types	2009-03-26 18:14:18 +01:00
drmP.h	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
i810_drm.h
i830_drm.h
i915_drm.h	drm/i915: Track purged state.	2009-09-23 01:10:38 +01:00
Kbuild	DRM: add mode setting support	2008-12-29 17:47:23 +10:00
mga_drm.h	make drm headers use strict integer types	2009-03-26 18:14:18 +01:00
r128_drm.h
radeon_drm.h	drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.	2009-09-18 16:01:59 +10:00
savage_drm.h
sis_drm.h
via_drm.h	make drm headers use strict integer types	2009-03-26 18:14:18 +01:00