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)
commitb77e0e84630332abb34237b5d874f5fd159c2afc
tree849d75f363f7445676d971e9496c9f7aa231489a
parent04fa4e24583e18fd25e4d7af1b1ade6baa9632b7
parent4eb15b7fe7ad2a055f79eb1056a0c2d3317ff6f0
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
Makefile
kernel/futex.c
net/ipv4/route.c