Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
Olof Johansson [Thu, 10 Nov 2011 01:02:13 +0000 (17:02 -0800)]
1  2 
arch/arm/mach-msm/board-msm8x60.c

Simple merge