git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a448f8f
21c3ea1
)
Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next
author
Dave Chinner
<david@fromorbit.com>
Mon, 13 Apr 2015 01:40:16 +0000
(11:40 +1000)
committer
Dave Chinner
<david@fromorbit.com>
Mon, 13 Apr 2015 01:40:16 +0000
(11:40 +1000)
Conflicts:
fs/xfs/xfs_iops.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff