744c62eb65
Linux 3.5-rc5 collides with further development. Conflicts: drivers/regulator/tps65023-regulator.c
Linux 3.5-rc5 collides with further development. Conflicts: drivers/regulator/tps65023-regulator.c