git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c3cce6c
1081230
)
Merge linux-block/for-4.3/core into md/for-linux
author
NeilBrown
<neilb@suse.com>
Sat, 5 Sep 2015 09:07:04 +0000
(11:07 +0200)
committer
NeilBrown
<neilb@suse.com>
Sat, 5 Sep 2015 09:08:32 +0000
(11:08 +0200)
There were a few conflicts that are fairly easy to resolve.
Signed-off-by: NeilBrown <neilb@suse.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff