git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2d6dcc6
376c2f3
)
Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next
author
Dave Chinner
<david@fromorbit.com>
Mon, 19 May 2014 22:56:00 +0000
(08:56 +1000)
committer
Dave Chinner
<david@fromorbit.com>
Mon, 19 May 2014 22:56:00 +0000
(08:56 +1000)
Conflicts:
fs/xfs/xfs_ialloc.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff