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

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/usb/core/hub.c
index 00d4085f1d255327b96ba20680e5fea9dbbbfb1a,03eed28de77c79433559f7a1f4677ea56876ad1d..a51e1ffe65ce0ff7c7e1f55ae6423f0b180c2205
mode 100755,100644..100755
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c

diff --cc drivers/usb/gadget/f_rndis.c
Simple merge

diff --cc fs/block_dev.c
index 8ff421c193579b6eba8fc3d878d81a37b400dd80,16cea865268e98c0fabc30b4361a95cb54f49baa..267c5005e948f56b4163156c7e913d1694b4af3e
mode 100755,100644..100755
--- 1/fs/block_dev.c
--- 2/fs/block_dev.c
+++ b/fs/block_dev.c

diff --cc mm/page_alloc.c
Simple merge

diff --cc sound/soc/codecs/wm_hubs.c
index b409e60cbe4803ea5a1fd558f9c8a1251ae15e62,12506dc4feb5be06ad92269b6cf351f9d2f798ff..e1924d5dc3fd4fa6e85a5859e71666542cfe485b
mode 100755,100644..100755
--- 1/sound/soc/codecs/wm_hubs.c
--- 2/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c