|author||Jiri Kosina <firstname.lastname@example.org>||2012-02-06 16:11:09 +0100|
|committer||Jiri Kosina <email@example.com>||2012-02-06 16:12:16 +0100|
Merge branch 'master' of git://git.kernel.org/pub/scm/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.