黄涛 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

..

raid6test

md: drivers/md/unroll.pl replaced with awk analog

2009-10-16 16:25:19 +11:00

.gitignore

gitignore: misc files

2006-01-01 22:21:50 +01:00

bitmap.c

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

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

bitmap.h

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

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

dm-bio-record.h

dm: preserve bi_io_vec when resubmitting bios

2009-04-02 19:55:23 +01:00

dm-crypt.c

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

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

dm-delay.c

dm table: pass correct dev area size to device_area_is_valid

2009-07-23 20:30:42 +01:00

dm-exception-store.c

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

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

dm-exception-store.h

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

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

dm-io.c

dm io: retry after barrier error

2009-06-22 10:12:26 +01:00

dm-ioctl.c

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

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

dm-kcopyd.c

dm kcopyd: fix callback race

2009-04-09 00:27:17 +01:00

dm-linear.c

dm table: pass correct dev area size to device_area_is_valid

2009-07-23 20:30:42 +01:00

dm-log-userspace-base.c

dm log: userspace fix incorrect luid cast in userspace_ctr

2009-10-16 23:18:15 +01:00

dm-log-userspace-transfer.c

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

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

dm-log-userspace-transfer.h

dm log: userspace add luid to distinguish between concurrent log instances

2009-09-04 20:40:34 +01:00

dm-log.c

dm log: fix create_log_context to use logical_block_size of log device

2009-06-22 10:12:33 +01:00

dm-mpath.c

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

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

dm-mpath.h

dm mpath: remove is_active from struct dm_path

2008-10-10 13:36:58 +01:00

dm-path-selector.c

dm: path selector use module refcount directly

2009-04-02 19:55:27 +01:00

dm-path-selector.h

dm mpath: add start_io and nr_bytes to path selectors

2009-06-22 10:12:27 +01:00

dm-queue-length.c

dm mpath: add queue length load balancer

2009-06-22 10:12:27 +01:00

dm-raid1.c

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

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

dm-region-hash.c

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

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

dm-round-robin.c

dm mpath: add start_io and nr_bytes to path selectors

2009-06-22 10:12:27 +01:00

dm-service-time.c

dm mpath: add service time load balancer

2009-06-22 10:12:28 +01:00

dm-snap-persistent.c

dm snapshot: use unsigned integer chunk size

2009-10-16 23:18:17 +01:00

dm-snap-transient.c

dm snapshot: move status to exception store

2009-04-02 19:55:35 +01:00

dm-snap.c

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

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

dm-stripe.c

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

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

dm-sysfs.c

dm: sysfs add suspended attribute

2009-06-22 10:12:29 +01:00

dm-table.c

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

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

dm-target.c

dm target: remove struct tt_internal

2009-04-02 19:55:28 +01:00

dm-uevent.c

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

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

dm-uevent.h

dm: uevent generate events

2007-10-20 02:01:26 +01:00

dm-zero.c

dm: consolidate target deregistration error handling

2009-01-06 03:04:58 +00:00

dm.c

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

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

dm.h

dm: remove queue next_ordered workaround for barriers

2009-07-23 20:30:40 +01:00

faulty.c

md: Move check for bitmap presence to personality code.

2009-06-18 08:49:23 +10:00

Kconfig

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

linear.c

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

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

linear.h

md/linear: use call_rcu to free obsolete 'conf' structures.

2009-06-18 08:49:42 +10:00

Makefile

md: drivers/md/unroll.pl replaced with awk analog

2009-10-16 16:25:19 +11:00

md.c

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

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

md.h

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

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

mktables.c

md/raid6: move raid6 data processing to raid6_pq.ko

2009-03-31 15:09:39 +11:00

multipath.c

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

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

multipath.h

md: remove mddev_to_conf "helper" macro

2009-06-16 16:54:21 +10:00

raid0.c

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

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

raid0.h

md: remove mddev_to_conf "helper" macro

2009-06-16 16:54:21 +10:00

raid1.c

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

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

raid1.h

md: remove mddev_to_conf "helper" macro

2009-06-16 16:54:21 +10:00

raid5.c

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

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

raid5.h

md: fix problems with RAID6 calculations for DDF.

2009-10-16 16:27:34 +11:00

raid6algos.c

md/raid6: move raid6 data processing to raid6_pq.ko

2009-03-31 15:09:39 +11:00

raid6altivec.uc

md: drivers/md/unroll.pl replaced with awk analog

2009-10-16 16:25:19 +11:00

raid6int.uc

md: drivers/md/unroll.pl replaced with awk analog

2009-10-16 16:25:19 +11:00

raid6mmx.c

md/raid6: move raid6 data processing to raid6_pq.ko

2009-03-31 15:09:39 +11:00

raid6recov.c

md/raid6: move raid6 data processing to raid6_pq.ko

2009-03-31 15:09:39 +11:00

raid6sse1.c

md/raid6: move raid6 data processing to raid6_pq.ko

2009-03-31 15:09:39 +11:00

raid6sse2.c

md/raid6: move raid6 data processing to raid6_pq.ko

2009-03-31 15:09:39 +11:00

raid6x86.h

md: fix typo in FSF address

2009-03-31 14:57:37 +11:00

raid10.c

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

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

raid10.h

md: remove mddev_to_conf "helper" macro

2009-06-16 16:54:21 +10:00

unroll.awk

md: drivers/md/unroll.pl replaced with awk analog

2009-10-16 16:25:19 +11:00