Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Wed, 12 Dec 2012 09:18:39 +0000 (17:18 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 12 Dec 2012 09:18:39 +0000 (17:18 +0800)
Conflicts:
Makefile

1  2 
kernel/futex.c
net/ipv4/route.c

diff --cc kernel/futex.c
Simple merge
Simple merge