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)
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)
diff --cc arch/arm/mm/mmu.c
Simple merge
diff --cc include/net/tcp.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc net/bluetooth/hci_core.c

index 0c81430fec8cb3aee82fe7e338a2e16927555782,7cd007291d1c9cc5c391a9100a463c9f06ab3520..1dabd76404466a41933e4fa7f07c8e266757263c

mode 100755,100644..100755
--- 1/net/bluetooth/hci_core.c
--- 2/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
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)
		1	2
arch/arm/mm/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	patch \|	diff1 \|	diff2 \|	blob \| history