projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c6cc9fc
92413a9
)
Merge branch 'urgent'
author
Anton Vorontsov
<anton@enomsg.org>
Mon, 25 Mar 2013 03:06:35 +0000
(20:06 -0700)
committer
Anton Vorontsov
<anton@enomsg.org>
Mon, 25 Mar 2013 03:06:35 +0000
(20:06 -0700)
Conflicts:
drivers/power/pm2301_charger.c
Trivial merge