Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Sat, 23 Feb 2013 08:41:10 +0000 (16:41 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sat, 23 Feb 2013 08:41:10 +0000 (16:41 +0800)
commit03c2032989ef0150a10f8abd8f977c6f6b96df29
tree67d6976c1a1c2c4f2c54c27620432814f24e3f4f
parente2467d9d89974acb46de3c869d69a2c090d409d0
parent21d69845e411bfcee426070af5416ddfba350529
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.66
Conflicts:
Makefile
kernel/printk.c