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)
commit47f0ac2b0a8c7f26b513a2a18045219b030aedf1
tree27f33a5c1e40ee2a494758c1da2e03e86a09e32c
parent7925231037447d1a9036f31c823d362bf2ef4bb0
parentc3b92c8787367a8bb53d57d9789b558f1295cc96
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.