git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d41bb03
5e9383f
)
Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next
author
Dave Chinner
<david@fromorbit.com>
Wed, 25 Mar 2015 04:12:30 +0000
(15:12 +1100)
committer
Dave Chinner
<david@fromorbit.com>
Wed, 25 Mar 2015 04:12:30 +0000
(15:12 +1100)
Conflicts:
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_inode.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff