merge 7be773407306d9865e5393b904422a309b988b56 from
CyanogenMod/android_kernel_htc_m7
includes Second row (ion patch)