Merge tag 'v3.1' from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorAnton Vorontsov <cbouatmailru@gmail.com>
Thu, 24 Nov 2011 22:49:45 +0000 (02:49 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Thu, 24 Nov 2011 22:54:59 +0000 (02:54 +0400)
Battery tree missed last merge window, so it became stale enough
so that patches no longer apply as people use pretty recent kernels.


Trivial merge