Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
author黄涛 <huangtao@rock-chips.com>
Thu, 16 Jun 2011 03:56:59 +0000 (11:56 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 16 Jun 2011 03:56:59 +0000 (11:56 +0800)
commit7cd3739f32f642e2bdd722b253abbc4318202002
tree5ca3b8c6e9ac3c77e586fc0e175905a1bc05c188
parent2748ae2cc2276d238e1d0d54b739fa1009fd94ad
parentf9a11ede7aeb9bdcb5b2d51366401520afc555c4
Merge remote-tracking branch 'linux-2.6.32.y/master' into develop

Merge Linux 2.6.32.41
Conflicts:
Makefile
drivers/mmc/core/core.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/regd_common.h
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/dma.h
drivers/net/wireless/b43/sdio.c
drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-helpers.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/p54/txrx.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/usb/serial/option.c
mm/shmem.c
21 files changed:
arch/arm/kernel/signal.c
drivers/i2c/i2c-core.c
drivers/mmc/core/core.c
drivers/mmc/core/sdio.c
drivers/net/Makefile
drivers/usb/core/hub.c
drivers/usb/serial/option.c
fs/proc/base.c
fs/proc/task_mmu.c
include/linux/mmc/host.h
include/linux/sched.h
include/sound/soc-dapm.h
init/Kconfig
kernel/cpuset.c
kernel/sched.c
kernel/sys.c
kernel/time/clocksource.c
mm/shmem.c
net/bluetooth/sco.c
net/ipv4/devinet.c
sound/soc/codecs/wm_hubs.c