| commit | d4730ace0c7dbb64513e35b6fc5fd7e7f381e490 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Mon Feb 06 16:11:09 2012 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Mon Feb 06 16:12:16 2012 +0100 |
| tree | 18890c096cdd869a593c56de3257faa40af8e050 | |
| parent | c1c454b8691cc95aa83f19273ed7845914c70e83 [diff] | |
| parent | 23783f817bceedd6d4e549385e3f400ea64059e5 [diff] |
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.