Merge branch 'urgent'
authorAnton Vorontsov <anton@enomsg.org>
Mon, 25 Mar 2013 03:06:35 +0000 (20:06 -0700)
committerAnton Vorontsov <anton@enomsg.org>
Mon, 25 Mar 2013 03:06:35 +0000 (20:06 -0700)
commit6e997bb894beef128fcfe1679e0830f97dee6dc2
tree078d95af4d30b5e3d5b1db18de215489b26e01ce
parentc6cc9fc9d42ec82da2c770f0bef1488dc467f29c
parent92413a9bee1299cedcc0e5cfbfbc6b42496fb817
Merge branch 'urgent'

Conflicts:
drivers/power/pm2301_charger.c