]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorJiri Kosina <jkosina@suse.cz>
Mon, 6 Feb 2012 15:11:09 +0000 (16:11 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 6 Feb 2012 15:12:16 +0000 (16:12 +0100)
commit45a522fe0d1a87a2f966f89aa7b8d2ec44c9bde5
tree18890c096cdd869a593c56de3257faa40af8e050
parentcfc251f6bbfba92200be4941b713d53e3870cb85
parent7ac3ee482a586ba92f6d44b854c820dc8504c412
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 2a9fdea76c9 ("power_supply: add "powers"
links to self-powered HID devices") which went in through Anton's
tree.