summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2011-11-24 22:49:45 (GMT)
committerAnton Vorontsov <cbouatmailru@gmail.com>2011-11-24 22:54:59 (GMT)
commit47f0ac2b0a8c7f26b513a2a18045219b030aedf1 (patch)
tree27f33a5c1e40ee2a494758c1da2e03e86a09e32c /drivers/power
parent7925231037447d1a9036f31c823d362bf2ef4bb0 (diff)
parentc3b92c8787367a8bb53d57d9789b558f1295cc96 (diff)
downloadlinux-fsl-qoriq-47f0ac2b0a8c7f26b513a2a18045219b030aedf1.tar.xz
Merge tag 'v3.1' from git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'drivers/power')
0 files changed, 0 insertions, 0 deletions