projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1c454b 23783f8)
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)
commitd4730ace0c7dbb64513e35b6fc5fd7e7f381e490
tree18890c096cdd869a593c56de3257faa40af8e050tree | snapshot
parentc1c454b8691cc95aa83f19273ed7845914c70e83commit | diff
parent23783f817bceedd6d4e549385e3f400ea64059e5commit | diff
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.
Domain: SCM / Uncategorized;