Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Wed, 24 Aug 2011 02:22:42 +0000 (10:22 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 24 Aug 2011 02:22:42 +0000 (10:22 +0800)
commit68e9e2752ad9f5838e4dbadae3ad166656ab2e83
tree01df9d9f740c796f8067dc53e42a07fc640855c9
parent237861ff518a4309f892b1597388c62f8f8f4d00
parent971a633cd7476e9c176f2dfbd73676a36f8e0798
Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

Conflicts:
drivers/usb/gadget/f_mass_storage.c
drivers/base/power/main.c
drivers/mmc/host/rk29_sdmmc.c
drivers/usb/gadget/f_mass_storage.c