]> 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)
commit09a899c7583d776cc228a8c35ff52f4b084dd801
tree18890c096cdd869a593c56de3257faa40af8e050
parent57dbfb4cdbd288461d40c7df6b81bad1c0dea7d2
parent1d738fcd231e7234c71434d2a6aa9c823f7818ed
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 e97175de85b ("power_supply: add "powers"
links to self-powered HID devices") which went in through Anton's
tree.