git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a63ef0
0cefb29
)
Merge branch 'xfs-dio-extend-fix' into for-next
author
Dave Chinner
<david@fromorbit.com>
Thu, 16 Apr 2015 12:13:18 +0000
(22:13 +1000)
committer
Dave Chinner
<david@fromorbit.com>
Thu, 16 Apr 2015 12:13:18 +0000
(22:13 +1000)
Conflicts:
fs/xfs/xfs_file.c
Trivial merge