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

..

agp

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

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

hw_random

move virtrng_remove to .devexit.text

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

ip2

tty: rewrite the ldisc locking

2009-06-11 08:51:01 -07:00

ipmi

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

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

mwave

mwave: fix read buffer overflow

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

pcmcia

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

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

rio

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

tpm

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

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

xilinx_hwicap

const: constify remaining file_operations

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

.gitignore

[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.

2006-10-03 17:59:17 +01:00

amiserial.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

apm-emulation.c

const: constify remaining file_operations

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

applicom.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

applicom.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

bfin_jtag_comm.c

bfin_jtag_comm: clean up printk usage

2009-06-22 11:32:23 -07:00

bfin-otp.c

const: constify remaining file_operations

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

briq_panel.c

briq_panel: BKL pushdown

2008-06-20 14:05:55 -06:00

bsr.c

powerpc/BSR: Fix BSR to allow mmap of small BSR on 64k kernel

2009-06-26 14:37:26 +10:00

cd1865.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ChangeLog

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

consolemap.c

consolemap: indentation & braces disagree - reindent

2009-01-06 15:59:30 -08:00

cp437.uni

unicode table for cp437

2008-12-13 11:25:49 -08:00

cs5535_gpio.c

Add a bunch of cycle_kernel_lock() calls

2008-06-20 14:05:53 -06:00

cyclades.c

cyclades: fix read buffer overflow

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

dcc_tty.c

[ARM] armv6 dcc tty driver

2010-02-03 20:48:11 -08:00

defkeymap.c_shipped

Fix default compose table initialization

2008-03-03 14:53:16 -08:00

defkeymap.map

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

digi1.h

[PATCH] Clean up the old digi support and rescue it

2005-09-07 16:57:20 -07:00

digiFep1.h

[PATCH] Clean up the old digi support and rescue it

2005-09-07 16:57:20 -07:00

digiPCI.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ds1302.c

rtc: use bcd2bin/bin2bcd

2008-10-20 08:52:41 -07:00

ds1620.c

[ARM] netwinder: clean up GPIO naming

2008-12-13 09:12:07 +00:00

dsp56k.c

device create: char: convert device_create_drvdata to device_create

2008-10-16 09:24:42 -07:00

dtlk.c

headers: remove sched.h from poll.h

2009-10-04 15:05:10 -07:00

efirtc.c

drivers/char/efirtc.c: removed duplicated #include

2008-08-04 16:59:56 -07:00

epca.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

epca.h

epca: use tty_port

2008-07-20 17:12:36 -07:00

epcaconfig.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

esp.c

serial: move delta_msr_wait into the tty_port

2009-09-19 13:13:31 -07:00

generic_nvram.c

powerpc/nvram: Enable use Generic NVRAM driver for different size chips

2009-09-11 16:02:11 +10:00

generic_serial.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

genrtc.c

headers: Fix build after <linux/sched.h> removal

2009-10-13 10:20:16 -07:00

hangcheck-timer.c

drivers/char/: Spelling fixes

2008-02-03 17:11:42 +02:00

hpet.c

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

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

hvc_beat.c

powerpc/cell: Use correct types in beat files

2009-01-08 16:25:16 +11:00

hvc_console.c

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

2011-07-30 16:11:20 +08:00

hvc_console.h

hvc_console: Provide (un)locked version for hvc_resize()

2009-09-24 15:12:47 +10:00

hvc_irq.c

hvc_console: Call free_irq() only if request_irq() was successful

2009-01-13 14:48:01 +11:00

hvc_iseries.c

drivers/hvc: Add missing __devexit_p()

2009-06-16 14:15:44 +10:00

hvc_iucv.c

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

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

hvc_rtas.c

[POWERPC] hvc_rtas_init() must be __init

2008-02-14 22:11:02 +11:00

hvc_udbg.c

powerpc: udbg-based backend for hvc_console

2008-11-19 16:04:25 +11:00

hvc_vio.c

hvc_console: Add __init and __exit to hvc_vio

2009-08-28 14:24:11 +10:00

hvc_xen.c

xen/hvc: make sure console output is always emitted, with explicit polling

2009-11-03 11:05:51 -08:00

hvcs.c

Merge commit 'origin/master' into next

2009-06-18 11:16:55 +10:00

hvsi.c

powerpc/hvsi: Avoid calculating possibly-invalid address

2009-08-20 10:29:28 +10:00

i8k.c

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

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

isicom.c

isicom: split the open method for the isicom device

2009-09-19 13:13:27 -07:00

istallion.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

Kconfig

Make /dev/mem configurable, as we don't want it.

2010-02-03 21:26:59 -08:00

keyboard.c

Input: keyboard - fix braille keyboard keysym generation

2009-11-25 23:05:17 -08:00

lp.c

device create: char: convert device_create_drvdata to device_create

2008-10-16 09:24:42 -07:00

Makefile

add rk_sysrq interface

2010-12-27 16:12:33 +08:00

mbcs.c

[IA64] mbcs: fix printk format warnings

2009-09-15 08:42:00 -07:00

mbcs.h

MBCS: convert dmareadlock to mutex

2008-02-07 08:42:25 -08:00

mem.c

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

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

misc.c

seq_file: constify seq_operations

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

mmtimer.c

mmtimer: Push BKL down into the ioctl handler

2008-07-17 11:34:49 -07:00

moxa.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

moxa.h

Char: moxa, cleanup rx/tx

2008-04-30 08:29:43 -07:00

mspec.c

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

mxser.c

tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl

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

mxser.h

mxser: convert large macros to functions

2008-04-30 08:29:49 -07:00

n_hdlc.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

n_r3964.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

n_tty.c

n_tty: move echoctl check and clean up logic

2009-09-19 13:13:34 -07:00

nozomi.c

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

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

nsc_gpio.c

[PATCH] struct path: convert char-drivers

2006-12-08 08:28:44 -08:00

nvram.c

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

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

nwbutton.c

[PATCH] Char: timers cleanup

2007-02-12 09:48:30 -08:00

nwbutton.h

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

nwflash.c

[ARM] netwinder: clean up GPIO naming

2008-12-13 09:12:07 +00:00

pc8736x_gpio.c

pc8736x_gpio: add support for PC87365 chips

2008-10-20 08:52:40 -07:00

ppdev.c

ppdev: reduce kernel log spam

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

ps3flash.c

ps3flash: Always read chunks of 256 KiB, and cache them

2009-06-15 16:47:27 +10:00

pty.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

random.c

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

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

raw.c

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

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

riscom8_reg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

riscom8.c

tty: riscom8, fix tty refcnt

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

riscom8.h

tty: add more tty_port fields

2008-07-20 17:12:38 -07:00

rk_sysrq.c

rk_sysrq: fix warning

2011-01-11 11:01:19 +08:00

rocket_int.h

tty: rocketport uses different port flags to everyone else

2009-01-02 10:19:39 -08:00

rocket.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

rocket.h

tty: rocketport uses different port flags to everyone else

2009-01-02 10:19:39 -08:00

rtc.c

headers: Fix build after <linux/sched.h> removal

2009-10-13 10:20:16 -07:00

scc.h

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

scx200_gpio.c

Add a bunch of cycle_kernel_lock() calls

2008-06-20 14:05:53 -06:00

selection.c

tty: rewrite the ldisc locking

2009-06-11 08:51:01 -07:00

ser_a2232.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

ser_a2232.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ser_a2232fw.ax

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ser_a2232fw.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

serial167.c

serial167: fix read buffer overflow

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

snsc_event.c

byteorder: don't directly include linux/byteorder/generic.h

2008-05-16 12:01:45 -07:00

snsc.c

device create: char: convert device_create_drvdata to device_create

2008-10-16 09:24:42 -07:00

snsc.h

Convert asm/semaphore.h users to linux/semaphore.h

2008-04-18 22:22:54 -04:00

sonypi.c

headers: Fix build after <linux/sched.h> removal

2009-10-13 10:20:16 -07:00

specialix_io8.h

tty: add more tty_port fields

2008-07-20 17:12:38 -07:00

specialix.c

specialix.c: convert nested spin_lock_irqsave to spin_lock

2009-07-20 16:38:43 -07:00

stallion.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

sx.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

sx.h

Char: char/serial, remove SERIAL_TYPE_NORMAL redefines

2008-02-07 08:42:33 -08:00

sxboards.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sxwindow.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

synclink_gt.c

hdlc: convert to netdev_tx_t

2009-09-01 01:13:31 -07:00

synclink.c

hdlc: convert to netdev_tx_t

2009-09-01 01:13:31 -07:00

synclinkmp.c

hdlc: convert to netdev_tx_t

2009-09-01 01:13:31 -07:00

sysrq.c

perf: Do the big rename: Performance Counters -> Performance Events

2009-09-21 14:28:04 +02:00

tb0219.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

tlclk.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

toshiba.c

toshiba: use ioremap_cached

2008-04-30 23:15:34 +02:00

tty_audit.c

tty: remove buffer special casing

2009-06-11 08:51:02 -07:00

tty_buffer.c

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

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

tty_io.c

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

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

tty_ioctl.c

tty: vt: use printk_once

2009-09-19 13:13:35 -07:00

tty_ldisc.c

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

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

tty_port.c

tty_port: handle the nonblocking open of a dead port corner case

2009-11-30 16:38:25 -08:00

uv_mmtimer.c

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

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

vc_screen.c

vc: create vcs(a) devices for consoles

2009-07-20 16:38:43 -07:00

viotape.c

tape: beyond ARRAY_SIZE of viocd_diskinfo

2009-06-02 10:32:34 +10:00

virtio_console.c

virtio: let header files include virtio_ids.h

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

vme_scc.c

m68k: vme_scc - Kill warn_unused_result warnings

2009-01-12 20:56:38 +01:00

vt_ioctl.c

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

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

vt.c

tty: vt: use printk_once

2009-09-19 13:13:35 -07:00