From: Anton Vorontsov <cbouatmailru@gmail.com>
Date: Thu, 24 Nov 2011 22:49:45 +0000 (+0400)
Subject: Merge tag 'v3.1' from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: firefly_0821_release~3680^2~3750^2~46
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=47f0ac2b0a8c7f26b513a2a18045219b030aedf1;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.1' from git://git./linux/kernel/git/torvalds/linux.git into master

Battery tree missed last merge window, so it became stale enough
so that patches no longer apply as people use pretty recent kernels.
---

47f0ac2b0a8c7f26b513a2a18045219b030aedf1