projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eadc387
46fcb2e
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 22 Jul 2011 20:10:41 +0000
(13:10 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 22 Jul 2011 20:10:41 +0000
(13:10 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: combine duplicated block freeing routines
GFS2: Add S_NOSEC support
GFS2: Automatically adjust glock min hold time
GFS2: Cache dir hash table in a contiguous buffer
Trivial merge