merged more changes from sultan-kernel-bruce-linaro, fixed sweep2wake