diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-26 14:45:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-26 14:45:42 -0800 |
| commit | d49981150387c481779a544ec641f17882f4bbfb (patch) | |
| tree | 02661a89635bd191b069f546b97d5cd3c63f2426 /drivers/mtd/maps | |
| parent | 392b8e47bada8a1068ab0c0bdc44c58726dc395b (diff) | |
| parent | 28d57d437786eb3e44f1ca3f0f41e7cfe29c6dd4 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: add IO error check in ocfs2_get_sector()
ocfs2: set gap to seperate entry and value when xattr in bucket
ocfs2: lock the metaecc process for xattr bucket
ocfs2: Use the right access_* method in ctime update of xattr.
ocfs2/dlm: Make dlm_assert_master_handler() kill itself instead of the asserter
ocfs2/dlm: Use ast_lock to protect ast_list
ocfs2: Cleanup the lockname print in dlmglue.c
ocfs2/dlm: Retract fix for race between purge and migrate
ocfs2: Access and dirty the buffer_head in mark_written.
Diffstat (limited to 'drivers/mtd/maps')
0 files changed, 0 insertions, 0 deletions