git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c14fc01
b29c70f
)
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
author
Dave Chinner
<david@fromorbit.com>
Wed, 3 Dec 2014 22:46:17 +0000
(09:46 +1100)
committer
Dave Chinner
<david@fromorbit.com>
Wed, 3 Dec 2014 22:46:17 +0000
(09:46 +1100)
Conflicts:
fs/xfs/xfs_iops.c
Trivial merge