linux

mirror of https://github.com/hardkernel/linux.git synced 2026-04-18 19:40:46 +09:00

Files

黄涛 380873f76d Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

This reverts commit 67078ecae3, reversing
changes made to dc136618cb.

Conflicts:

	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/eeprom.c
	drivers/net/wireless/ath/ath5k/eeprom.h
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/mac.c
	drivers/net/wireless/ath/ath9k/mac.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/reg.h
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/rfkill.c
	drivers/net/wireless/b43legacy/rfkill.c
	drivers/net/wireless/ipw2x00/ipw2100.c
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000-hw.h
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
	drivers/net/wireless/iwlwifi/iwl-eeprom.h
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/iwmc3200wifi/iwm.h
	drivers/net/wireless/libertas/scan.c
	drivers/net/wireless/libertas/wext.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rtl818x/rtl8187.h
	drivers/net/wireless/rtl818x/rtl8187_dev.c
	drivers/net/wireless/rtl818x/rtl8187_rfkill.c
	drivers/usb/serial/option.c

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

ahci.c

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

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

ata_generic.c

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

2011-07-30 16:24:52 +08:00

ata_piix.c

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

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

Kconfig

libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers

2009-09-17 16:47:06 -04:00

libata-acpi.c

libata: make gtf_filter per-dev

2009-10-06 00:26:27 -04:00

libata-core.c

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

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

libata-eh.c

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

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

libata-pmp.c

libata: add SATA PMP revision information for spec 1.2

2009-09-08 21:21:14 -04:00

libata-scsi.c

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

2011-07-30 16:24:52 +08:00

libata-sff.c

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

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

libata.h

libata: make gtf_filter per-dev

2009-10-06 00:26:27 -04:00

Makefile

libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers

2009-09-17 16:47:06 -04:00

pata_acpi.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_ali.c

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

2011-07-30 16:24:52 +08:00

pata_amd.c

pata_amd: do not filter out valid modes in nv_mode_filter

2009-09-17 16:46:41 -04:00

pata_artop.c

pata_artop: Serializing support

2009-03-24 22:45:05 -04:00

pata_at32.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_at91.c

pata_at91: fix resource release

2009-08-12 06:16:47 -04:00

pata_atiixp.c

ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2

2009-10-16 06:21:20 -04:00

pata_atp867x.c

pata_atp867x: add Power Management support

2009-10-06 20:58:23 -04:00

pata_bf54x.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_cmd64x.c

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

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

pata_cmd640.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_cs5520.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

pata_cs5530.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_cs5535.c

pata_cs5535: add pci id for AMD based CS5535 controllers

2009-09-11 02:31:31 -04:00

pata_cs5536.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_cypress.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_efar.c

pata_efar: fix PIO2 underclocking

2009-06-05 14:40:52 -04:00

pata_hpt3x2n.c

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

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

pata_hpt3x3.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_hpt37x.c

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

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

pata_hpt366.c

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

2011-07-30 16:01:15 +08:00

pata_icside.c

Merge branch 'origin' into devel

2009-03-28 20:29:51 +00:00

pata_isapnp.c

[libata] Improve timeout handling

2009-03-24 22:52:39 -04:00

pata_it821x.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_it8213.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_ixp4xx_cf.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

pata_jmicron.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_legacy.c

pata_legacy: wait for async probing

2009-06-05 14:40:46 -04:00

pata_marvell.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_mpc52xx.c

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

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

pata_mpiix.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_netcell.c

pata_netcell: Fix typo

2009-06-08 09:12:28 -07:00

pata_ninja32.c

ata: Report 16/32bit PIO as best we can

2009-04-16 15:28:23 -04:00

pata_ns87410.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_ns87415.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_octeon_cf.c

drivers/ata: use resource_size

2009-09-11 02:25:58 -04:00

pata_of_platform.c

powerpc: Fix no interrupt handling in pata_of_platform

2008-10-10 15:55:17 +11:00

pata_oldpiix.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_opti.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_optidma.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_palmld.c

[ARM] 5522/1: PalmLD: IDE support

2009-05-31 14:50:40 +01:00

pata_pcmcia.c

pata_pcmcia: add CNF-CDROM-ID

2009-07-28 21:05:18 -04:00

pata_pdc202xx_old.c

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

2011-07-30 16:24:52 +08:00

pata_pdc2027x.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_platform.c

drivers/ata: use resource_size

2009-09-11 02:25:58 -04:00

pata_qdi.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_radisys.c

pata_radisys: fix mwdma_mask to exclude mwdma0

2009-03-24 22:13:32 -04:00

pata_rb532_cf.c

drivers/ata: use resource_size

2009-09-11 02:25:58 -04:00

pata_rdc.c

[libata] Add pata_rdc driver for RDC ATA devices

2009-09-01 19:47:20 -04:00

pata_rz1000.c

pata_rz1000: use printk_once

2009-09-11 02:33:59 -04:00

pata_sc1200.c

pata_sc1200: Fix crash on boot

2009-10-16 06:22:40 -04:00

pata_scc.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_sch.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_serverworks.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_sil680.c

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

2011-07-30 16:01:15 +08:00

pata_sis.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_sl82c105.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_triflex.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pata_via.c

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

2011-07-30 16:24:52 +08:00

pata_winbond.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

pdc_adma.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

sata_fsl.c

sata_fsl: Split hard and soft reset

2009-11-19 18:18:17 -05:00

sata_inic162x.c

drivers/ata: Remove unnecessary semicolons

2009-09-01 19:47:20 -04:00

sata_mv.c

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

2011-07-30 16:24:52 +08:00

sata_nv.c

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

2011-07-30 16:24:52 +08:00

sata_promise.c

sata_promise: update reset code

2009-09-17 16:46:34 -04:00

sata_promise.h

libata annotations and fixes

2008-01-23 05:24:15 -05:00

sata_qstor.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

sata_sil24.c

sata_sil24: always set protocol override for non-ATAPI data commands

2009-09-01 19:47:21 -04:00

sata_sil.c

[libata] sata_sil: disable DMA engine in sil_freeze()

2009-09-01 19:47:19 -04:00

sata_sis.c

sata_sis: convert to slave_link

2009-09-08 21:17:36 -04:00

sata_svw.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

sata_sx4.c

sata_sx4: speed up ECC initialization

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

sata_uli.c

[libata] convert drivers to use ata.h mode mask defines

2009-03-24 22:13:27 -04:00

sata_via.c

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

2011-07-30 16:24:52 +08:00

sata_vsc.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

sis.h

libata: PATA-mode fixes for sis_sata

2007-07-02 10:17:42 -04:00