Merge branch 'urgent'

Conflicts:
	drivers/power/pm2301_charger.c
This commit is contained in:
Anton Vorontsov 2013-03-24 20:06:35 -07:00
commit 6e997bb894
300 changed files with 3161 additions and 1599 deletions