Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Tue, 15 Jan 2013 04:45:19 +0000 (12:45 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 15 Jan 2013 04:45:19 +0000 (12:45 +0800)
commite1c56a82b56c1f26a2de88c848d33bcf71a01812
treeea54da0f3c65c31dd9f0ddb8a8cf0cbef2ff48b8
parent9843000222a193bf01b26d07a99340ba1afd2166
parent2a68fec1118107fbaa40c631d45641d40d88ad71
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.58
Conflicts:
Makefile
drivers/net/wireless/p54/p54usb.c
arch/arm/mm/mmu.c
include/net/tcp.h
kernel/cgroup.c
net/bluetooth/hci_core.c