Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 05:11:48 +0000 (13:11 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 21 Aug 2012 05:11:48 +0000 (13:11 +0800)
commit109b0ba09445a8f5ac1c15cccc689f68236f7e41
treebd0ff622361b49b85b21e9d2e7f5093acd24214a
parent91f521d23ddd1307b7c44c00597412f307b40ab5
parenta422ca75bd264cd26bafeb6305655245d2ea7c6b
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
Makefile
drivers/net/tun.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/usb/core/hub.c
sound/soc/codecs/wm8994.c
12 files changed:
drivers/mfd/wm831x-otp.c
drivers/net/tun.c
drivers/rtc/rtc-wm831x.c
drivers/usb/core/hub.c
drivers/usb/gadget/u_ether.c
include/linux/cpu.h
include/linux/sched.h
kernel/fork.c
kernel/futex.c
kernel/power/suspend.c
mm/page_alloc.c
net/ipv4/tcp.c