Merge remote-tracking branch 'linux-2.6.32.y/master' into develop
author黄涛 <huangtao@rock-chips.com>
Tue, 28 Jun 2011 01:47:32 +0000 (09:47 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 28 Jun 2011 01:47:32 +0000 (09:47 +0800)
commit2caa51d22aaf6dd05475ebb7b67bf0de29cbb9af
treef60a92398e2445425c8d3e50c761e9559eec6e87
parentcc88c1f62a752f6e7948c763fde38e12d6a30a22
parentc49ed7e7d1461ed0ce88548de0d67c88784a99f3
Merge remote-tracking branch 'linux-2.6.32.y/master' into develop

Merge Linux 2.6.32.42
Conflicts:
Makefile
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/p54/p54usb.c
block/blk-core.c
drivers/usb/core/hub.c
drivers/usb/gadget/f_rndis.c
fs/block_dev.c
mm/page_alloc.c
sound/soc/codecs/wm_hubs.c