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

..

ABI

Documentation: ABI: /sys/devices/system/cpu/cpu#/node

2009-10-30 14:59:53 -07:00

accounting

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

acpi

…

aoe

…

arm

ARM: 5738/1: Correct TCM documentation

2009-10-01 16:26:16 +01:00

auxdisplay

includecheck fix: Documentation, cfag12864b-example.c

2009-09-24 07:20:57 -07:00

blackfin

…

block

Trivial typo fixes in Documentation/block/data-integrity.txt.

2009-07-01 10:56:25 +02:00

blockdev

mflash: initial support

2009-04-07 08:12:38 +02:00

cdrom

debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.

2009-06-15 21:30:28 -07:00

cgroups

cgroups: update documentation of cgroups tasks and procs files

2009-10-08 07:36:39 -07:00

connector

connector: Provide the sender's credentials to the callback

2009-10-02 10:54:01 -07:00

console

…

cpu-freq

[CPUFREQ] update Doc for cpuinfo_cur_freq and scaling_cur_freq

2009-09-01 12:45:09 -04:00

cpuidle

…

cris

…

crypto

async_tx: add support for asynchronous RAID6 recovery operations

2009-08-29 19:09:27 -07:00

development-process

docs: Encourage better changelogs in the development process document

2009-06-04 10:32:49 -06:00

device-mapper

dm raid1: add userspace log

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

DocBook

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

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

driver-model

driver model: fix show/store prototypes in doc.

2009-07-12 13:02:10 -07:00

dvb

V4L/DVB (12902): Documentation: synchronize documentation for Technisat cards

2009-09-19 00:14:32 -03:00

early-userspace

…

fault-injection

debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.

2009-06-15 21:30:28 -07:00

fb

fbdev: Migrate mailing lists to vger

2009-11-30 13:46:04 -08:00

filesystems

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

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

firmware_class

driver core: fix documentation of request_firmware_nowait

2009-06-15 21:30:24 -07:00

frv

…

hwmon

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

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

i2c

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

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

i2o

…

ia64

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

ide

ide: preserve Host Protected Area by default (v2)

2009-06-07 13:52:52 +02:00

infiniband

IB: Fix typo in udev rule documentation

2009-10-07 15:35:55 -07:00

input

Input: add new driver for Sentelic Finger Sensing Pad

2009-08-19 21:46:09 -07:00

ioctl

drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV

2009-09-24 07:21:03 -07:00

isdn

Documentation: expand isdn/INTERFACE.CAPI document

2009-10-06 22:20:51 -07:00

ja_JP

block: rename CONFIG_LBD to CONFIG_LBDAF

2009-06-19 08:08:50 +02:00

kbuild

kbuild: introduce ld-option

2009-09-20 12:27:42 +02:00

kdump

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

ko_KR

…

kvm

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

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

laptops

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

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

lguest

virtio: let header files include virtio_ids.h

2009-10-22 16:39:28 +10:30

m68k

…

make

…

mips

…

misc-devices

max6875: Discard obsolete detect method

2009-10-04 22:53:41 +02:00

mn10300

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

mtd

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

namespaces

…

netlabel

…

networking

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

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

parisc

…

PCI

PCI: document PCIe fundamental reset interfaces

2009-09-09 13:29:38 -07:00

pcmcia

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

power

Merge git://git.infradead.org/battery-2.6

2009-09-23 10:11:08 -07:00

powerpc

Merge git://git.infradead.org/mtd-2.6

2009-09-23 10:07:49 -07:00

pps

LinuxPPS: core support

2009-06-18 13:04:04 -07:00

prctl

…

RCU

rcu: Remove CONFIG_PREEMPT_RCU

2009-08-23 10:32:40 +02:00

s390

[S390] s390dbf: Add description for usage of "%s" in sprintf events

2009-09-11 10:29:53 +02:00

scheduler

sched: Documentation/sched-rt-group: Fix style issues & bump version

2009-06-21 13:12:46 +02:00

scsi

[SCSI] hptiop: Add RR44xx adapter support

2009-10-02 09:45:22 -05:00

serial

…

sh

…

sound

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

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

sparc

…

spi

spi: fix spelling of `automatically' in documentation

2009-09-23 07:39:44 -07:00

sysctl

Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6

2009-09-24 07:53:22 -07:00

telephony

…

thermal

thermal: sysfs-api.txt - document passive attribute for thermal zones

2009-11-05 18:11:18 -05:00

timers

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

trace

tracing: Fix comment typo and documentation example

2009-10-24 11:07:50 +02:00

uml

…

usb

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

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

video4linux

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

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

vm

Merge branch 'hostprogs-wmissing-prototypes' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux-misc

2009-11-17 09:14:49 -08:00

w1

ds2482: Discard obsolete detect method

2009-10-04 22:53:41 +02:00

watchdog

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

wimax

…

x86

USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp

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

zh_CN

…

00-INDEX

Bluetooth: Add documentation for Marvell Bluetooth driver

2009-08-22 14:25:32 -07:00

android.txt

[docs] android: Add android config documentation to boot framework.

2010-02-03 21:27:00 -08:00

applying-patches.txt

…

atomic_ops.txt

Documentation/atomic_ops.txt: fix sample code

2009-06-16 19:47:52 -07:00

bad_memory.txt

…

basic_profiling.txt

…

binfmt_misc.txt

…

braille-console.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

bt8xxgpio.txt

…

btmrvl.txt

Bluetooth: Add documentation for Marvell Bluetooth driver

2009-08-22 14:25:32 -07:00

BUG-HUNTING

…

c2port.txt

…

cachetlb.txt

…

Changes

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

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

CodingStyle

trivial: fix typo milisecond/millisecond for documentation and source comments.

2009-06-12 18:01:46 +02:00

cpu-hotplug.txt

…

cpu-load.txt

…

cputopology.txt

Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files

2009-10-30 14:59:52 -07:00

credentials.txt

…

dcdbas.txt

…

debugging-modules.txt

…

debugging-via-ohci1394.txt

ieee1394: update URLs in debugging-via-ohci1394.txt

2009-10-03 09:28:11 +02:00

dell_rbu.txt

trivial: Documentation/dell_rbu.txt: fix typos

2009-06-12 18:01:50 +02:00

devices.txt

lanana: assign a device name and numbering for MAX3100

2009-04-07 08:44:05 -07:00

DMA-API.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

DMA-attributes.txt

…

DMA-ISA-LPC.txt

…

DMA-mapping.txt

dma-mapping: update the old macro DMA_nBIT_MASK related documentations

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

dmaengine.txt

…

dontdiff

sparc: Kill PROM console driver.

2009-09-15 17:04:38 -07:00

dynamic-debug-howto.txt

…

edac.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

eisa.txt

…

email-clients.txt

…

feature-removal-schedule.txt

inotify: deprecate the inotify kernel interface

2009-10-18 15:49:38 -04:00

flexible-arrays.txt

Update flex_arrays.txt

2009-10-15 07:25:20 -06:00

futex-requeue-pi.txt

futex: add requeue-pi documentation

2009-05-09 07:12:50 +02:00

gcov.txt

trivial: fix typo in CONFIG_DEBUG_FS in gcov doc

2009-09-21 15:14:56 +02:00

gpio.txt

gpiolib: allow poll() on value

2009-09-23 07:39:48 -07:00

highuid.txt

…

HOWTO

…

hw_random.txt

…

ics932s401

…

initrd.txt

…

intel_txt.txt

x86, intel_txt: Intel TXT boot support

2009-07-21 11:49:06 -07:00

Intel-IOMMU.txt

intel-iommu: Kill DMAR_BROKEN_GFX_WA option.

2009-09-19 09:37:23 -07:00

io_ordering.txt

…

io-mapping.txt

…

IO-mapping.txt

…

iostats.txt

…

IPMI.txt

…

IRQ-affinity.txt

…

IRQ.txt

…

irqflags-tracing.txt

…

isapnp.txt

…

java.txt

…

kernel-doc-nano-HOWTO.txt

kernel-doc: allow multi-line declaration purpose descriptions

2009-09-18 09:48:52 -07:00

kernel-docs.txt

…

kernel-parameters.txt

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

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

keys-request-key.txt

…

keys.txt

KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]

2009-09-02 21:29:22 +10:00

kmemcheck.txt

kmemcheck: update documentation

2009-07-01 22:36:22 +02:00

kmemleak.txt

kmemleak: add clear command support

2009-09-08 16:36:08 +01:00

kobject.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

kprobes.txt

debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.

2009-06-15 21:30:28 -07:00

kref.txt

kref: double kref_put() in my_data_handler()

2009-09-18 09:48:52 -07:00

ldm.txt

…

leds-class.txt

led: document sysfs interface

2009-08-28 15:21:12 -04:00

leds-lp3944.txt

leds: LED driver for National Semiconductor LP3944 Funlight Chip

2009-06-23 20:21:38 +01:00

local_ops.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

lockdep-design.txt

lockdep: Fix typos in documentation

2009-08-07 12:03:46 +02:00

lockstat.txt

…

logo.gif

Revert "linux.conf.au 2009: Tuz"

2009-04-27 12:00:27 -07:00

logo.txt

Revert "linux.conf.au 2009: Tuz"

2009-04-27 12:00:27 -07:00

magic-number.txt

…

Makefile

…

ManagementStyle

…

mca.txt

…

md.txt

…

memory-barriers.txt

sched: Document memory barriers implied by sleep/wake-up primitives

2009-04-29 14:15:55 +02:00

memory-hotplug.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

memory.txt

Documentation/memory.txt: remove some very outdated recommendations

2009-09-22 07:17:26 -07:00

mono.txt

…

mutex-design.txt

…

nmi_watchdog.txt

…

nommu-mmap.txt

…

numastat.txt

mm: fix NUMA accounting in numastat.txt

2009-09-22 07:17:39 -07:00

oops-tracing.txt

…

parport-lowlevel.txt

…

parport.txt

…

pi-futex.txt

…

pnp.txt

…

preempt-locking.txt

…

printk-formats.txt

…

prio_tree.txt

…

rbtree.txt

trivial: rbtree.txt: fix rb_entry() parameters in sample code

2009-06-12 18:01:47 +02:00

rfkill.txt

rfkill: export persistent attribute in sysfs

2009-06-19 11:50:18 -04:00

robust-futex-ABI.txt

futex: documentation: fix inconsistent description of futex list_op_pending

2009-06-18 13:03:56 -07:00

robust-futexes.txt

…

rt-mutex-design.txt

…

rt-mutex.txt

…

rtc.txt

rtc: add boot_timesource sysfs attribute

2009-09-23 07:39:46 -07:00

SAK.txt

…

SecurityBugs

…

SELinux.txt

…

serial-console.txt

…

sgi-ioc4.txt

…

sgi-visws.txt

…

slow-work.txt

SLOW_WORK: Move slow_work's proc file to debugfs

2009-12-01 08:20:31 -08:00

SM501.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

Smack.txt

smack: implement logging V3

2009-04-14 09:00:23 +10:00

sparse.txt

Documentation: explain the difference between __bitwise and __bitwise__

2009-04-11 08:18:11 +02:00

spinlocks.txt

…

stable_api_nonsense.txt

…

stable_kernel_rules.txt

…

SubmitChecklist

block: rename CONFIG_LBD to CONFIG_LBDAF

2009-06-19 08:08:50 +02:00

SubmittingDrivers

…

SubmittingPatches

docs: update patch size in SubmittingPatches

2009-10-01 16:11:12 -07:00

svga.txt

…

sysfs-rules.txt

Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense

2009-05-08 19:22:20 -07:00

sysrq.txt

sysrq, kdump: make sysrq-c consistent

2009-07-29 19:10:36 -07:00

tomoyo.txt

tomoyo: add Documentation/tomoyo.txt

2009-04-14 09:14:58 +10:00

unaligned-memory-access.txt

…

unicode.txt

…

unshare.txt

…

VGA-softcursor.txt

…

vgaarbiter.txt

PCI/VGA: add VGA arbitration documentation

2009-09-09 13:29:42 -07:00

video-output.txt

…

volatile-considered-harmful.txt

…

voyager.txt

…

zorro.txt

…