黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop ...

Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c

2011-06-16 11:56:59 +08:00

..

alauda.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

cypress_atacb.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

datafab.c

USB: storage: Drop an unneeded a NULL test

2009-09-23 06:46:29 -07:00

debug.c

USB: remove CVS keywords

2008-07-21 15:15:55 -07:00

debug.h

USB: remove CVS keywords

2008-07-21 15:15:55 -07:00

freecom.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

initializers.c

USB: usb-storage fails to attach to Huawei Datacard cdrom device

2009-09-23 06:46:32 -07:00

initializers.h

USB: remove CVS keywords

2008-07-21 15:15:55 -07:00

isd200.c

isd200: use ATA_* defines instead of *_STAT and *_ERR ones

2009-04-01 21:42:25 +02:00

jumpshot.c

USB: storage: Drop an unneeded a NULL test

2009-09-23 06:46:29 -07:00

karma.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

Kconfig

usb-storage: make onetouch a separate module

2009-03-24 16:20:35 -07:00

libusual.c

usb-storage: prepare for subdriver separation

2009-03-24 16:20:34 -07:00

Makefile

usb-storage: fix mistake in Makefile

2009-04-17 10:50:26 -07:00

onetouch.c

USB: storage: fix a resume path GFP_NOIO must be used

2009-09-23 06:46:15 -07:00

option_ms.c

USB: Fix option_ms regression in 2.6.31-rc2

2009-07-12 15:16:40 -07:00

option_ms.h

USB: unusual dev for Option N.V. ZeroCD modems

2009-01-07 10:00:09 -08:00

protocol.c

usb-storage: prepare for subdriver separation

2009-03-24 16:20:34 -07:00

protocol.h

USB: usb-storage: merge ATAPI and QIC-157 protocol routines

2009-01-07 09:59:57 -08:00

scsiglue.c

block: Use accessor functions for queue limits

2009-05-22 23:22:54 +02:00

scsiglue.h

USB: remove CVS keywords

2008-07-21 15:15:55 -07:00

sddr09.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

sddr55.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

shuttle_usbat.c

USB: usb-storage: added missing MODULE_LICENSE("GPL") for usb-storage ums-* modules

2009-03-24 16:20:35 -07:00

sierra_ms.c

USB: storage: sierra_ms: fix sysfs file attribute

2010-12-09 13:26:57 -08:00

sierra_ms.h

USB Storage Sierra: TRU-Install feature update

2008-08-13 17:32:51 -07:00

transport.c

USB: usb-storage: add BAD_SENSE flag

2009-12-18 14:03:59 -08:00

transport.h

USB: usb-storage: merge CB and CBI transport routines

2009-01-07 09:59:57 -08:00

unusual_alauda.h

usb-storage: make alauda a separate module

2009-03-24 16:20:35 -07:00

unusual_cypress.h

USB: usb-storage: unusual_devs update for Cypress ATACB

2011-02-17 15:36:44 -08:00

unusual_datafab.h

usb-storage: make datafab a separate module

2009-03-24 16:20:34 -07:00

unusual_devs.h

USB: Storage: Add unusual_devs entry for VTech Kidizoom

2011-02-17 15:36:48 -08:00

unusual_freecom.h

usb-storage: make freecom a separate module

2009-03-24 16:20:34 -07:00

unusual_isd200.h

usb-storage: make isd200 a separate module

2009-03-24 16:20:34 -07:00

unusual_jumpshot.h

usb-storage: make jumpshot a separate module

2009-03-24 16:20:34 -07:00

unusual_karma.h

usb-storage: make karma a separate module

2009-03-24 16:20:35 -07:00

unusual_onetouch.h

usb-storage: make onetouch a separate module

2009-03-24 16:20:35 -07:00

unusual_sddr09.h

usb-storage: make sddr09 a separate module

2009-03-24 16:20:34 -07:00

unusual_sddr55.h

usb-storage: make sddr55 a separate module

2009-03-24 16:20:34 -07:00

unusual_usbat.h

usb-storage: make shuttle_usbat a separate module

2009-03-24 16:20:34 -07:00

usb.c

usb2.0 host & usb1.1 host support

2010-12-17 11:12:42 +08:00

usb.h

usb-storage: prepare for subdriver separation

2009-03-24 16:20:34 -07:00

usual-tables.c

usb-storage: make onetouch a separate module

2009-03-24 16:20:35 -07:00