Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Sat, 1 Dec 2012 04:07:55 +0000 (12:07 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sat, 1 Dec 2012 04:07:55 +0000 (12:07 +0800)
commitef62b5225e727baf228e18e0ee70fd1d9020f00c
tree13cabcee6fe5bb03c38375af2ec04b951d94c12f
parent199a818db71aa220f97fdac953a0eabb66e356d7
parent2fc3fd44850e68f21ce1746c2e94470cab44ffab
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
Makefile
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/rt2x00/rt2800lib.c
scripts/Kbuild.include
drivers/net/usb/usbnet.c
drivers/usb/serial/option.c
drivers/usb/serial/usb-serial.c
kernel/futex.c
net/ipv4/tcp.c
net/ipv6/route.c
net/wireless/reg.c
scripts/Kbuild.include
sound/core/pcm_native.c