黄涛 677ea8d595 Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 ... Conflicts: drivers/net/wireless/adm8211.c drivers/net/wireless/airo.c drivers/net/wireless/airo_cs.c drivers/net/wireless/at76c50x-usb.c drivers/net/wireless/at76c50x-usb.h drivers/net/wireless/ath/Kconfig drivers/net/wireless/ath/Makefile drivers/net/wireless/ath/ath.h drivers/net/wireless/ath/ath5k/Kconfig drivers/net/wireless/ath/ath5k/Makefile drivers/net/wireless/ath/ath5k/ani.c drivers/net/wireless/ath/ath5k/ani.h drivers/net/wireless/ath/ath5k/ath5k.h drivers/net/wireless/ath/ath5k/attach.c drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/base.h drivers/net/wireless/ath/ath5k/caps.c drivers/net/wireless/ath/ath5k/debug.c drivers/net/wireless/ath/ath5k/debug.h drivers/net/wireless/ath/ath5k/desc.c drivers/net/wireless/ath/ath5k/desc.h drivers/net/wireless/ath/ath5k/dma.c drivers/net/wireless/ath/ath5k/eeprom.c drivers/net/wireless/ath/ath5k/eeprom.h drivers/net/wireless/ath/ath5k/initvals.c drivers/net/wireless/ath/ath5k/led.c drivers/net/wireless/ath/ath5k/pcu.c drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/ath/ath5k/qcu.c drivers/net/wireless/ath/ath5k/reg.h drivers/net/wireless/ath/ath5k/reset.c drivers/net/wireless/ath/ath5k/rfbuffer.h drivers/net/wireless/ath/ath5k/sysfs.c drivers/net/wireless/ath/ath9k/Kconfig drivers/net/wireless/ath/ath9k/Makefile drivers/net/wireless/ath/ath9k/ahb.c drivers/net/wireless/ath/ath9k/ani.c drivers/net/wireless/ath/ath9k/ani.h drivers/net/wireless/ath/ath9k/ar5008_initvals.h drivers/net/wireless/ath/ath9k/ar5008_phy.c drivers/net/wireless/ath/ath9k/ar9001_initvals.h drivers/net/wireless/ath/ath9k/ar9002_calib.c drivers/net/wireless/ath/ath9k/ar9002_hw.c drivers/net/wireless/ath/ath9k/ar9002_initvals.h drivers/net/wireless/ath/ath9k/ar9002_mac.c drivers/net/wireless/ath/ath9k/ar9002_phy.c drivers/net/wireless/ath/ath9k/ar9002_phy.h drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h drivers/net/wireless/ath/ath9k/ar9003_calib.c drivers/net/wireless/ath/ath9k/ar9003_eeprom.c drivers/net/wireless/ath/ath9k/ar9003_eeprom.h drivers/net/wireless/ath/ath9k/ar9003_hw.c drivers/net/wireless/ath/ath9k/ar9003_mac.c drivers/net/wireless/ath/ath9k/ar9003_mac.h drivers/net/wireless/ath/ath9k/ar9003_paprd.c drivers/net/wireless/ath/ath9k/ar9003_phy.c drivers/net/wireless/ath/ath9k/ar9003_phy.h drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/btcoex.c drivers/net/wireless/ath/ath9k/btcoex.h drivers/net/wireless/ath/ath9k/calib.c drivers/net/wireless/ath/ath9k/calib.h drivers/net/wireless/ath/ath9k/common.c drivers/net/wireless/ath/ath9k/common.h drivers/net/wireless/ath/ath9k/debug.c drivers/net/wireless/ath/ath9k/debug.h drivers/net/wireless/ath/ath9k/eeprom.c drivers/net/wireless/ath/ath9k/eeprom.h drivers/net/wireless/ath/ath9k/eeprom_4k.c drivers/net/wireless/ath/ath9k/eeprom_9287.c drivers/net/wireless/ath/ath9k/eeprom_def.c drivers/net/wireless/ath/ath9k/gpio.c drivers/net/wireless/ath/ath9k/hif_usb.c drivers/net/wireless/ath/ath9k/hif_usb.h drivers/net/wireless/ath/ath9k/htc.h drivers/net/wireless/ath/ath9k/htc_drv_beacon.c drivers/net/wireless/ath/ath9k/htc_drv_init.c drivers/net/wireless/ath/ath9k/htc_drv_main.c drivers/net/wireless/ath/ath9k/htc_drv_txrx.c drivers/net/wireless/ath/ath9k/htc_hst.c drivers/net/wireless/ath/ath9k/htc_hst.h drivers/net/wireless/ath/ath9k/hw-ops.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/mac.c drivers/net/wireless/ath/ath9k/mac.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/pci.c drivers/net/wireless/ath/ath9k/phy.h drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/rc.h drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/ath/ath9k/reg.h drivers/net/wireless/ath/ath9k/wmi.c drivers/net/wireless/ath/ath9k/wmi.h drivers/net/wireless/ath/ath9k/xmit.c drivers/net/wireless/ath/debug.c drivers/net/wireless/ath/hw.c drivers/net/wireless/ath/main.c drivers/net/wireless/ath/reg.h drivers/net/wireless/ath/regd.c drivers/net/wireless/ath/regd.h drivers/net/wireless/ath/regd_common.h drivers/net/wireless/atmel.c drivers/net/wireless/atmel_cs.c drivers/net/wireless/b43/Kconfig drivers/net/wireless/b43/Makefile drivers/net/wireless/b43/b43.h drivers/net/wireless/b43/debugfs.c drivers/net/wireless/b43/dma.c drivers/net/wireless/b43/dma.h drivers/net/wireless/b43/leds.c drivers/net/wireless/b43/lo.c drivers/net/wireless/b43/main.c drivers/net/wireless/b43/main.h drivers/net/wireless/b43/pcmcia.c drivers/net/wireless/b43/phy_a.c drivers/net/wireless/b43/phy_common.c drivers/net/wireless/b43/phy_common.h drivers/net/wireless/b43/phy_g.c drivers/net/wireless/b43/phy_g.h drivers/net/wireless/b43/phy_lp.c drivers/net/wireless/b43/phy_n.c drivers/net/wireless/b43/phy_n.h drivers/net/wireless/b43/pio.c drivers/net/wireless/b43/rfkill.c drivers/net/wireless/b43/sdio.c drivers/net/wireless/b43/sysfs.c drivers/net/wireless/b43/tables_lpphy.c drivers/net/wireless/b43/tables_nphy.c drivers/net/wireless/b43/tables_nphy.h drivers/net/wireless/b43/wa.c drivers/net/wireless/b43/xmit.c drivers/net/wireless/b43/xmit.h drivers/net/wireless/b43legacy/b43legacy.h drivers/net/wireless/b43legacy/debugfs.c drivers/net/wireless/b43legacy/main.c drivers/net/wireless/b43legacy/phy.c drivers/net/wireless/b43legacy/rfkill.c drivers/net/wireless/b43legacy/xmit.c drivers/net/wireless/hostap/hostap_ap.c drivers/net/wireless/hostap/hostap_ap.h drivers/net/wireless/hostap/hostap_config.h drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/hostap/hostap_hw.c drivers/net/wireless/hostap/hostap_ioctl.c drivers/net/wireless/hostap/hostap_main.c drivers/net/wireless/hostap/hostap_wlan.h drivers/net/wireless/ipw2x00/ipw2100.c drivers/net/wireless/ipw2x00/ipw2100.h drivers/net/wireless/ipw2x00/ipw2200.c drivers/net/wireless/ipw2x00/ipw2200.h drivers/net/wireless/ipw2x00/libipw_module.c drivers/net/wireless/ipw2x00/libipw_rx.c drivers/net/wireless/iwlwifi/Kconfig drivers/net/wireless/iwlwifi/Makefile drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-5000-hw.h drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-6000-hw.h drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-agn-calib.c drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c drivers/net/wireless/iwlwifi/iwl-agn-hw.h drivers/net/wireless/iwlwifi/iwl-agn-ict.c drivers/net/wireless/iwlwifi/iwl-agn-lib.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/net/wireless/iwlwifi/iwl-agn-rs.h drivers/net/wireless/iwlwifi/iwl-agn-tx.c drivers/net/wireless/iwlwifi/iwl-agn-ucode.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-agn.h drivers/net/wireless/iwlwifi/iwl-commands.h drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-csr.h drivers/net/wireless/iwlwifi/iwl-debug.h drivers/net/wireless/iwlwifi/iwl-debugfs.c drivers/net/wireless/iwlwifi/iwl-dev.h drivers/net/wireless/iwlwifi/iwl-devtrace.c drivers/net/wireless/iwlwifi/iwl-devtrace.h drivers/net/wireless/iwlwifi/iwl-eeprom.c drivers/net/wireless/iwlwifi/iwl-eeprom.h drivers/net/wireless/iwlwifi/iwl-fh.h drivers/net/wireless/iwlwifi/iwl-hcmd.c drivers/net/wireless/iwlwifi/iwl-helpers.h drivers/net/wireless/iwlwifi/iwl-io.h drivers/net/wireless/iwlwifi/iwl-led.c drivers/net/wireless/iwlwifi/iwl-led.h drivers/net/wireless/iwlwifi/iwl-power.c drivers/net/wireless/iwlwifi/iwl-power.h drivers/net/wireless/iwlwifi/iwl-prph.h drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/iwlwifi/iwl-sta.c drivers/net/wireless/iwlwifi/iwl-sta.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/iwmc3200wifi/commands.c drivers/net/wireless/iwmc3200wifi/debugfs.c drivers/net/wireless/iwmc3200wifi/hal.c drivers/net/wireless/iwmc3200wifi/netdev.c drivers/net/wireless/iwmc3200wifi/rx.c drivers/net/wireless/iwmc3200wifi/sdio.c drivers/net/wireless/iwmc3200wifi/tx.c drivers/net/wireless/libertas/README drivers/net/wireless/libertas/cfg.c drivers/net/wireless/libertas/cmd.c drivers/net/wireless/libertas/cmdresp.c drivers/net/wireless/libertas/debugfs.c drivers/net/wireless/libertas/decl.h drivers/net/wireless/libertas/defs.h drivers/net/wireless/libertas/dev.h drivers/net/wireless/libertas/ethtool.c drivers/net/wireless/libertas/host.h drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/libertas/if_sdio.c drivers/net/wireless/libertas/if_sdio.h drivers/net/wireless/libertas/if_spi.c drivers/net/wireless/libertas/if_spi.h drivers/net/wireless/libertas/if_usb.c drivers/net/wireless/libertas/if_usb.h drivers/net/wireless/libertas/main.c drivers/net/wireless/libertas/mesh.c drivers/net/wireless/libertas/mesh.h drivers/net/wireless/libertas/rx.c drivers/net/wireless/libertas/tx.c drivers/net/wireless/libertas/types.h drivers/net/wireless/libertas_tf/if_usb.c drivers/net/wireless/libertas_tf/main.c drivers/net/wireless/mac80211_hwsim.c drivers/net/wireless/mwl8k.c drivers/net/wireless/orinoco/cfg.c drivers/net/wireless/orinoco/hw.c drivers/net/wireless/orinoco/main.c drivers/net/wireless/orinoco/orinoco_cs.c drivers/net/wireless/orinoco/orinoco_usb.c drivers/net/wireless/orinoco/scan.c drivers/net/wireless/orinoco/scan.h drivers/net/wireless/orinoco/spectrum_cs.c drivers/net/wireless/orinoco/wext.c drivers/net/wireless/p54/Kconfig drivers/net/wireless/p54/eeprom.c drivers/net/wireless/p54/eeprom.h drivers/net/wireless/p54/fwio.c drivers/net/wireless/p54/lmac.h drivers/net/wireless/p54/main.c drivers/net/wireless/p54/p54.h drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54spi.c drivers/net/wireless/p54/p54spi_eeprom.h drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/txrx.c drivers/net/wireless/prism54/isl_ioctl.c drivers/net/wireless/prism54/islpci_dev.c drivers/net/wireless/prism54/islpci_eth.c drivers/net/wireless/prism54/islpci_hotplug.c drivers/net/wireless/ray_cs.c drivers/net/wireless/ray_cs.h drivers/net/wireless/rayctl.h drivers/net/wireless/rndis_wlan.c drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/Makefile drivers/net/wireless/rt2x00/rt2400pci.c drivers/net/wireless/rt2x00/rt2400pci.h drivers/net/wireless/rt2x00/rt2500pci.c drivers/net/wireless/rt2x00/rt2500pci.h drivers/net/wireless/rt2x00/rt2500usb.c drivers/net/wireless/rt2x00/rt2800.h drivers/net/wireless/rt2x00/rt2800lib.c drivers/net/wireless/rt2x00/rt2800lib.h drivers/net/wireless/rt2x00/rt2800pci.c drivers/net/wireless/rt2x00/rt2800pci.h drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2800usb.h drivers/net/wireless/rt2x00/rt2x00.h drivers/net/wireless/rt2x00/rt2x00config.c drivers/net/wireless/rt2x00/rt2x00crypto.c drivers/net/wireless/rt2x00/rt2x00debug.c drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00dump.h drivers/net/wireless/rt2x00/rt2x00firmware.c drivers/net/wireless/rt2x00/rt2x00lib.h drivers/net/wireless/rt2x00/rt2x00link.c drivers/net/wireless/rt2x00/rt2x00mac.c drivers/net/wireless/rt2x00/rt2x00pci.c drivers/net/wireless/rt2x00/rt2x00pci.h drivers/net/wireless/rt2x00/rt2x00queue.c drivers/net/wireless/rt2x00/rt2x00queue.h drivers/net/wireless/rt2x00/rt2x00reg.h drivers/net/wireless/rt2x00/rt2x00soc.c drivers/net/wireless/rt2x00/rt2x00usb.c drivers/net/wireless/rt2x00/rt2x00usb.h drivers/net/wireless/rt2x00/rt61pci.c drivers/net/wireless/rt2x00/rt61pci.h drivers/net/wireless/rt2x00/rt73usb.c drivers/net/wireless/rt2x00/rt73usb.h drivers/net/wireless/rtl818x/Makefile drivers/net/wireless/rtl818x/rtl8180/grf5101.h drivers/net/wireless/rtl818x/rtl8180/max2820.h drivers/net/wireless/rtl818x/rtl8180/rtl8180.h drivers/net/wireless/rtl818x/rtl8180/rtl8225.h drivers/net/wireless/rtl818x/rtl8180/sa2400.h drivers/net/wireless/rtl818x/rtl8187/leds.h drivers/net/wireless/rtl818x/rtl8187/rfkill.h drivers/net/wireless/rtl818x/rtl8187/rtl8225.h drivers/net/wireless/wl1251/io.h drivers/net/wireless/wl12xx/Kconfig drivers/net/wireless/wl12xx/Makefile drivers/net/wireless/wl12xx/wl12xx_80211.h drivers/net/wireless/wl3501_cs.c drivers/net/wireless/zd1201.c drivers/net/wireless/zd1211rw/Makefile drivers/net/wireless/zd1211rw/zd_chip.c drivers/net/wireless/zd1211rw/zd_chip.h drivers/net/wireless/zd1211rw/zd_def.h drivers/net/wireless/zd1211rw/zd_mac.c drivers/net/wireless/zd1211rw/zd_mac.h drivers/net/wireless/zd1211rw/zd_rf.h drivers/net/wireless/zd1211rw/zd_rf_al2230.c drivers/net/wireless/zd1211rw/zd_rf_al7230b.c drivers/net/wireless/zd1211rw/zd_rf_rf2959.c drivers/net/wireless/zd1211rw/zd_rf_uw2453.c drivers/net/wireless/zd1211rw/zd_usb.c drivers/net/wireless/zd1211rw/zd_usb.h		2011-10-28 16:07:07 +08:00
..
bitops	bitops: add #ifndef for each of find bitops	2011-05-26 17:12:38 -07:00
4level-fixup.h
atomic-long.h
atomic.h
atomic64.h
audit_change_attr.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_dir_write.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_read.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
audit_signal.h
audit_write.h	audit: support the "standard" <asm-generic/unistd.h>	2011-05-04 14:41:28 -04:00
auxvec.h
bitops.h	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
bitsperlong.h
bug.h	bug.h: Move ratelimit warn interfaces to ratelimit.h	2011-05-26 15:00:31 -04:00
bugs.h
cache.h
cacheflush.h	asm-generic/cacheflush.h: flush icache when copying to user pages	2011-05-25 08:39:37 -07:00
checksum.h
cmpxchg-local.h
cmpxchg.h
cputime.h	time: Add nsecs_to_cputime64 interface for asm-generic	2011-01-26 12:33:20 +01:00
current.h
delay.h
device.h
div64.h
dma-coherent.h
dma-mapping-broken.h
dma-mapping-common.h	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
dma.h
emergency-restart.h
errno-base.h
errno.h	mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally	2011-03-17 13:08:27 -03:00
fb.h
fcntl.h	New kind of open files - "location only".	2011-03-15 02:21:45 -04:00
ftrace.h	asm-generic headers: add ftrace.h	2011-03-17 09:19:04 +08:00
futex.h	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
getorder.h
gpio.h	Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0	2011-10-28 16:07:07 +08:00
hardirq.h
hw_irq.h
ide_iops.h
int-l64.h
int-ll64.h
io.h	asm-generic: fix inX/outX functions for architectures that have PCI	2011-03-17 09:19:03 +08:00
ioctl.h
ioctls.h	tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys	2011-02-17 14:16:30 -08:00
iomap.h
ipcbuf.h
irq_regs.h	core: Replace __get_cpu_var with __this_cpu_read if not used for an address.	2010-12-17 15:07:19 +01:00
irq.h
irqflags.h
Kbuild
Kbuild.asm
kdebug.h
kmap_types.h
libata-portmap.h
linkage.h
local.h
local64.h
memory_model.h
mm_hooks.h
mman-common.h	thp: mm: define MADV_NOHUGEPAGE	2011-01-13 17:32:47 -08:00
mman.h
mmu_context.h
mmu.h
module.h
msgbuf.h
mutex-dec.h
mutex-null.h
mutex-xchg.h
mutex.h
page.h
param.h
parport.h
pci-dma-compat.h
pci.h
percpu.h
pgalloc.h
pgtable-nopmd.h
pgtable-nopud.h
pgtable.h	include/asm-generic/pgtable.h: fix unbalanced parenthesis	2011-06-15 20:04:00 -07:00
poll.h
posix_types.h
ptrace.h	asm-generic/ptrace.h: start a common low level ptrace helper	2011-05-26 17:12:36 -07:00
resource.h	ulimit: raise default hard ulimit on number of files to 4096	2011-05-25 08:39:43 -07:00
rtc.h
scatterlist.h
sections.h	x86: Separate out entry text section	2011-03-08 17:22:11 +01:00
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
siginfo.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
signal-defs.h
signal.h
sizes.h	asm-generic headers: add sizes.h	2011-03-17 09:19:04 +08:00
socket.h
sockios.h
spinlock.h
stat.h	asm-generic/stat.h: support 64-bit file time_t for stat()	2010-11-01 15:31:29 -04:00
statfs.h
string.h
swab.h
syscall.h
syscalls.h
system.h
termbits.h
termios-base.h
termios.h
timex.h
tlb.h	mm: uninline large generic tlb.h functions	2011-05-25 08:39:20 -07:00
tlbflush.h
topology.h
types.h	add the common dma_addr_t typedef to include/linux/types.h	2011-03-22 17:44:09 -07:00
uaccess-unaligned.h
uaccess.h	asm-generic headers: add arch-specific __strnlen_user calling in uaccess.h	2011-03-17 09:19:05 +08:00
ucontext.h
unaligned.h
unistd.h	asm-generic/unistd.h: support sendmmsg syscall	2011-06-02 14:31:38 -04:00
user.h	asm-generic/user.h: Fix spelling in comment	2011-03-01 15:49:39 +01:00
vga.h
vmlinux.lds.h	Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-05-24 11:53:42 -07:00
xor.h	sanitize <linux/prefetch.h> usage	2011-05-20 12:50:29 -07:00