Merge Y300-J1 release (19/11/2013)

http://consumer.huawei.com/en/support/downloads/detail/index.htm?id=17937

Conflicts:
	drivers/media/video/msm/torch.c