Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Wed, 18 Jul 2012 02:14:33 +0000 (10:14 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 18 Jul 2012 02:14:33 +0000 (10:14 +0800)
commit728ae3fd2cd7c9d07c08bb3cca1860df85e8dd77
tree1166913241741d8b7fc6957fab13f0e61894bcd7
parentaa0e2f856a8f82a31ec74955c11808193bb66941
parent0429adee45b26809890a8590d3a68ddcb198ebeb
Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/usb/serial/usb-serial.c
include/linux/fb.h