From: Jiri Kosina 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-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d4730ace0c7dbb64513e35b6fc5fd7e7f381e490;p=~shefty%2Frdma-dev.git 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. --- d4730ace0c7dbb64513e35b6fc5fd7e7f381e490