git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3cabb83
964aa8d
)
Merge branch 'xfs-generic-sb-counters' into for-next
author
Dave Chinner
<david@fromorbit.com>
Mon, 23 Feb 2015 23:27:28 +0000
(10:27 +1100)
committer
Dave Chinner
<david@fromorbit.com>
Mon, 23 Feb 2015 23:27:28 +0000
(10:27 +1100)
Conflicts:
fs/xfs/xfs_super.c
Trivial merge