From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 6 Feb 2012 15:11:09 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: firefly_0821_release~3680^2~3435^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d4730ace0c7dbb64513e35b6fc5fd7e7f381e490;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into upstream-fixes

Sync with Linus' tree. This is necessary to have a base for
patch that fixes commit 35b4c01e29b ("power_supply: add "powers"
links to self-powered HID devices") which went in through Anton's
tree.
---

d4730ace0c7dbb64513e35b6fc5fd7e7f381e490