Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
commitfd3316fde02fdeab8b36fcd60cad6a4a840421bc
tree04cdd8db74e9522a4d5ff78ca48bc56b90ed4fde
parent767cf3e403c30730b46e36e31fde391584314fbf
parente496537363b337a318a2f113029e68b76f9baa2d
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
Makefile
arch/arm/Kconfig
block/blk-core.c
kernel/module.c
mm/shmem.c