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)
Conflicts:
drivers/power/pm2301_charger.c


Trivial merge