git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d907a3
ab3e57b
)
Merge branch 'xfs-feature-bit-cleanup' into for-next
author
Dave Chinner
<david@fromorbit.com>
Mon, 19 May 2014 22:57:02 +0000
(08:57 +1000)
committer
Dave Chinner
<david@fromorbit.com>
Mon, 19 May 2014 22:57:02 +0000
(08:57 +1000)
Conflicts:
fs/xfs/xfs_inode.c
Trivial merge