From: Anton Vorontsov <anton@enomsg.org>
Date: Mon, 25 Mar 2013 03:06:35 +0000 (-0700)
Subject: Merge branch 'urgent'
X-Git-Tag: v3.10-rc1~148^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e997bb894beef128fcfe1679e0830f97dee6dc2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'urgent'

Conflicts:
	drivers/power/pm2301_charger.c
---

6e997bb894beef128fcfe1679e0830f97dee6dc2