merge changes from HTC 2.95 kernel source