Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Mon, 15 Oct 2012 03:56:57 +0000 (11:56 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 15 Oct 2012 03:56:57 +0000 (11:56 +0800)
commit70c481fac3570139f4a3081dbb81ded192260019
tree6850411ee5944e16f0bb8aaec8cab57c281f4285
parent115b00eeeb9892dfcad9d83527279f7c2f013c70
parent40e6f9362555294cf1ce8abb1981b11d622e04d6
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
Makefile
drivers/mtd/nand/nand_bbt.c
kernel/sched.c
kernel/sys.c
net/ipv4/tcp.c
net/ipv6/route.c
net/xfrm/xfrm_policy.c
scripts/Kbuild.include