Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Wed, 23 Jan 2013 01:49:26 +0000 (09:49 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 23 Jan 2013 01:49:26 +0000 (09:49 +0800)
commitf34f67b5452b400dfdbc75cccfa7a64abf695074
tree5b2d60ed5e8081a6034109c62447c2db4ae57e99
parent92cac13785f7a7878ada2f7a444e8a4d752cde13
parentd4184347012fbe705671037a4a0e4c7021ea4329
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.60
Conflicts:
Makefile
drivers/usb/serial/option.c