Bring in driver from newer samsung kernel release

Also include "battery: Convert to 3.0 kernel power management"