projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1c454b
23783f8
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author
Jiri Kosina
<jkosina@suse.cz>
Mon, 6 Feb 2012 15:11:09 +0000
(16:11 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Mon, 6 Feb 2012 15:12:16 +0000
(16:12 +0100)
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.
Trivial merge