linux

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

Files

黄涛 8aac13f440 Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

Conflicts:
	drivers/mmc/card/block.c
	drivers/net/usb/asix.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath9k/ar9002_calib.c
	drivers/net/wireless/ath/ath9k/ar9002_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	drivers/net/wireless/ath/ath9k/ar9003_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/init.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/hostap/hostap_main.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-power.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
	drivers/net/wireless/rt2x00/rt2x00usb.c
	drivers/usb/serial/option.c

2011-11-09 13:06:28 +08:00

cpm_uart

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

jsm

serial: ioremap warning fix for jsm driver.

2011-06-07 09:25:34 -07:00

8250_accent.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

8250_acorn.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

8250_boca.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

8250_early.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

8250_exar_st16c554.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

8250_fourport.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

8250_gsc.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

8250_hp300.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

8250_hub6.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

8250_mca.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

8250_pci.c

8250_pci: add support for Rosewill RC-305 4x serial port card

2011-10-03 11:39:48 -07:00

8250_pnp.c

serial: 8250_pnp: add Intermec CV60 touchscreen device

2011-10-03 11:39:48 -07:00

8250.c

8250: Fix race condition in serial8250_backup_timeout().

2011-10-03 11:39:48 -07:00

8250.h

tty/serial: Add explicit PORT_TEGRA type

2011-05-19 16:51:01 -07:00

21285.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

68328serial.c

arch, mm: filter disallowed nodes from arch specific show_mem functions

2011-05-25 08:39:03 -07:00

68328serial.h

68328serial: remove unsed m68k_serial->tqueue_hangup

2011-02-03 14:16:49 -08:00

68360serial.c

Merge 2.6.38-rc6 into tty-next

2011-02-24 11:36:31 -08:00

altera_jtaguart.c

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

2011-03-16 17:28:10 -07:00

altera_uart.c

serial: altera_uart: Scan for a free port if platform device id is -1

2011-04-19 16:31:19 -07:00

amba-pl010.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

amba-pl011.c

amba pl011: workaround for uart registers lockup

2011-06-16 12:01:57 -07:00

apbuart.c

sparc32,leon: Fixed APBUART frequency detection

2011-03-30 04:28:54 -07:00

apbuart.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

atmel_serial.c

atmel_serial: fix internal port num

2011-06-25 13:34:21 +08:00

bcm63xx_uart.c

serial: bcm63xx_uart: fix irq storm after rx fifo overrun.

2011-06-16 12:01:58 -07:00

bfin_5xx.c

serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock

2011-02-03 14:44:54 -08:00

bfin_sport_uart.c

treewide: cleanup continuations and remove logging message whitespace

2011-04-26 10:24:37 +02:00

bfin_sport_uart.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

clps711x.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

crisv10.c

tty: now phase out the ioctl file pointer for good

2011-02-17 11:59:56 -08:00

crisv10.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

dz.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

dz.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

icom.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

icom.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

ifx6x60.c

Serial: ifx6x60c: Remove duplicate includes of linux/tty.h

2011-04-19 16:33:37 -07:00

ifx6x60.h

serial: ifx6x60: minor cleanup

2011-02-17 11:16:15 -08:00

imx.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-05-23 12:23:20 -07:00

ioc3_serial.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

ioc4_serial.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

ip22zilog.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

ip22zilog.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

Kconfig

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

kgdboc.c

kgdboc,kgdbts: strlen() doesn't count the terminator

2011-03-25 16:37:30 -05:00

lantiq.c

SERIAL: Lantiq: Add driver for MIPS Lantiq SOCs.

2011-05-19 09:55:43 +01:00

m32r_sio_reg.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

m32r_sio.c

m32r: fix spin_lock_irqsave() misuse

2011-05-26 17:12:33 -07:00

m32r_sio.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

Makefile

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

max3100.c

workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'

2011-02-16 17:48:59 +01:00

max3107-aava.c

tty: Add "spi:" prefix for spi modalias

2011-10-03 11:39:49 -07:00

max3107.c

tty: Add "spi:" prefix for spi modalias

2011-10-03 11:39:49 -07:00

max3107.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

mcf.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

mfd.c

treewide: cleanup continuations and remove logging message whitespace

2011-04-26 10:24:37 +02:00

mpc52xx_uart.c

dt/serial: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:46 -07:00

mpsc.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

mrst_max3110.c

tty: Add "spi:" prefix for spi modalias

2011-10-03 11:39:49 -07:00

mrst_max3110.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

msm_serial_hs.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

msm_serial.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

msm_serial.h

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

msm_smd_tty.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

mux.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

mxs-auart.c

Freescale STMP37XX/STMP378X Application UART driver: remove duplicate linux/device.h include

2011-02-15 18:35:42 +01:00

netx-serial.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

nwpserial.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

of_serial.c

drivercore: revert addition of of_match to struct device

2011-05-18 12:32:23 -06:00

omap-serial.c

omap-serial: Allow IXON and IXOFF to be disabled.

2011-10-03 11:39:48 -07:00

pch_uart.c

drivers/tty/serial/pch_uart.c: don't oops if dmi_get_system_info returns NULL

2011-06-15 20:04:02 -07:00

pmac_zilog.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

pmac_zilog.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

pnx8xxx_uart.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

pxa.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

rk2818_serial.h

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

rk_serial.c

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

s3c24a0.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

s3c2400.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

s3c2410.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

s3c2412.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

s3c2440.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

s3c6400.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

s5pv210.c

ARM: SAMSUNG: serial: Fix on handling of one clock source for UART

2011-06-07 09:25:34 -07:00

sa1100.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

samsung.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

samsung.h

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

sb1250-duart.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

sc26xx.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

sc8800.c

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

sc8800.h

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

serial_core.c

serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data.

2011-06-14 09:09:15 -07:00

serial_cs.c

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

serial_ks8695.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

serial_txx9.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

sh-sci.c

Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2011-05-23 21:24:07 -07:00

sh-sci.h

sh: sh-sci: sh7377 and sh73a0 build fixes

2011-05-23 12:41:37 +09:00

sn_console.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

suncore.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

suncore.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

sunhv.c

dt/serial: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:46 -07:00

sunsab.c

dt/serial: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:46 -07:00

sunsab.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

sunsu.c

dt/serial: Eliminate users of of_platform_{,un}register_driver

2011-02-28 13:22:46 -07:00

sunzilog.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

sunzilog.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

timbuart.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

timbuart.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

uartlite.c

dt: uartlite: merge platform and of_platform driver bindings

2011-02-28 13:22:43 -07:00

ucc_uart.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2011-03-18 06:31:43 -07:00

vr41xx_siu.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

vt8500_serial.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

xilinx_uartps.c

tty/serial: add support for Xilinx PS UART

2011-05-03 10:26:39 -07:00

zs.c

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00

zs.h

tty: move drivers/serial/ to drivers/tty/serial/

2011-01-13 12:10:18 -08:00