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

..

act200l-sir.c

drivers/net/*/: Use static const

2010-12-21 02:16:10 -08:00

actisys-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

ali-ircc.c

treewide: fix a few typos in comments

2011-05-10 10:16:21 +02:00

ali-ircc.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

au1k_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

au1000_ircc.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

bfin_sir.c

net/irda: convert bfin_sir to common Blackfin UART header

2011-05-24 01:13:11 -04:00

bfin_sir.h

net/irda: convert bfin_sir to common Blackfin UART header

2011-05-24 01:13:11 -04:00

bu92725guw.c

newton: update irda bu92747 drivers

2011-10-09 17:52:06 +08:00

bu92725guw.h

newton: update irda bu92747 drivers

2011-10-09 17:52:06 +08:00

donauboe.c

Fix common misspellings

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

donauboe.h

Fix common misspellings

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

ep7211-sir.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

esi-sir.c

…

girbil-sir.c

Fix common misspellings

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

ir_serial.c

newton: update irda bu92747 drivers

2011-10-09 17:52:06 +08:00

ir_serial.h

newton: updata irda serial driver

2011-07-28 18:29:52 -07:00

irda-usb.c

Fix common misspellings

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

irda-usb.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

irtty-sir.c

tiocmset: kill the file pointer argument

2011-02-17 11:52:43 -08:00

irtty-sir.h

…

Kconfig

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

kingsun-sir.c

headers: kref.h redux

2009-09-26 10:17:19 -07:00

ks959-sir.c

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

ksdazzle-sir.c

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

litelink-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

ma600-sir.c

drivers/net/irda: fix sparse warnings: make symbols static

2008-12-26 00:03:19 -08:00

Makefile

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

mcp2120-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

mcs7780.c

Fix common misspellings

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

mcs7780.h

irda: convert to netdev_tx_t

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

nsc-ircc.c

Fix common misspellings

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

nsc-ircc.h

Fix common misspellings

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

old_belkin-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

pxaficp_ir.c

Fix common misspellings

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

rk29_ir.c

newton: add irda serial driver

2011-07-17 02:17:50 -07:00

rk29_ir.h

newton: add irda serial driver

2011-07-17 02:17:50 -07:00

sa1100_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

sh_irda.c

net/irda/sh_irda: return to RX mode when TX error

2011-01-18 16:13:51 -08:00

sh_sir.c

SuperH IrDA: correct Baud rate error correction

2010-11-21 10:09:53 -08:00

sir_dev.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-10-23 11:47:02 -07:00

sir_dongle.c

remove CONFIG_KMOD from drivers

2008-10-17 02:38:35 +11:00

sir-dev.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

smsc-ircc2.c

irda: fix smsc-ircc2 section mismatch warning

2011-10-03 11:40:20 -07:00

smsc-ircc2.h

irda: remove CVS keywords

2008-06-11 21:00:41 -07:00

smsc-sio.h

…

stir4200.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

tekram-sir.c

irda: replace __FUNCTION__ with __func__

2008-07-30 17:20:18 -07:00

toim3232-sir.c

headers: remove sched.h from interrupt.h

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

via-ircc.c

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

via-ircc.h

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

vlsi_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

vlsi_ir.h

Fix common misspellings

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

w83977af_ir.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

w83977af_ir.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

w83977af.h

…