summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* GFS2: Fix permissions checking for setflags ioctl()Steven Whitehouse2010-05-241-0/+7
* GFS2: Don't "get" xattrs for ACLs when ACLs are turned offSteven Whitehouse2010-05-211-0/+4
* GFS2: Rework reclaiming unlinked dinodesBob Peterson2010-05-215-54/+54
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu...Linus Torvalds2010-05-2114-350/+423
|\
| * nilfs2: disallow remount of snapshot from/to a regular mountRyusuke Konishi2010-05-101-34/+23
| * nilfs2: use huge_encode_dev/huge_decode_devRyusuke Konishi2010-05-101-2/+2
| * nilfs2: update comment on deactivate_super at nilfs_get_sbRyusuke Konishi2010-05-101-1/+1
| * nilfs2: replace MS_VERBOSE with MS_SILENTRyusuke Konishi2010-05-101-1/+2
| * nilfs2: add missing initialization of s_modeRyusuke Konishi2010-05-101-0/+1
| * nilfs2: fix misuse of open_bdev_exclusive/close_bdev_exclusiveRyusuke Konishi2010-05-101-3/+7
| * nilfs2: enlarge s_volume_name member in nilfs_super_blockJiro SEKIBA2010-05-101-2/+1
| * nilfs2: use checkpoint number instead of timestamp to select super blockRyusuke Konishi2010-05-101-3/+7
| * nilfs2: add missing endian conversion on super block magic numberRyusuke Konishi2010-05-101-2/+2
| * nilfs2: make nilfs_sc_*_ops staticRyusuke Konishi2010-05-101-3/+3
| * nilfs2: add kernel doc comments to persistent object allocator functionsRyusuke Konishi2010-05-102-1/+160
| * nilfs2: change sc_timer from a pointer to an embedded one in struct nilfs_sc_...Li Hong2010-05-102-19/+14
| * nilfs2: remove nilfs_segctor_init() in segment.cLi Hong2010-05-101-8/+1
| * nilfs2: insert checkpoint number in segment summary headerRyusuke Konishi2010-05-105-3/+12
| * nilfs2: add a print message after loading nilfs2Li Hong2010-05-101-0/+1
| * nilfs2: cleanup multi kmem_cache_{create,destroy} codeLi Hong2010-05-107-164/+97
| * nilfs2: move out checksum routines to segment buffer codeRyusuke Konishi2010-05-103-36/+39
| * nilfs2: move pointer to super root block into logsRyusuke Konishi2010-05-104-26/+25
| * nilfs2: change default of 'errors' mount option to 'remount-ro' modeRyusuke Konishi2010-05-102-5/+5
| * nilfs2: Combine nilfs_btree_release_path() and nilfs_btree_free_path()Li Hong2010-05-101-17/+5
| * nilfs2: Combine nilfs_btree_alloc_path() and nilfs_btree_init_path()Li Hong2010-05-101-22/+17
| * nilfs2: fix style problems in nilfs2_fs.hRyusuke Konishi2010-05-101-4/+4
| * nilfs2: update comment for struct nilfs_dat_entryQinghuang Feng2010-05-101-4/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2010-05-2120-185/+368
|\ \
| * | GFS2: Fix typoSteven Whitehouse2010-05-141-1/+1
| * | GFS2: stuck in inode wait, no glocks stuckBob Peterson2010-05-121-48/+30
| * | GFS2: Eliminate useless err variableBob Peterson2010-05-121-3/+1
| * | GFS2: Fix writing to non-page aligned gfs2_quota structuresAbhijith Das2010-05-101-25/+61
| * | GFS2: Add some useful messagesSteven Whitehouse2010-05-064-1/+6
| * | GFS2: fix quota state reportingChristoph Hellwig2010-05-051-4/+12
| * | GFS2: Various gfs2_logd improvementsBenjamin Marzinski2010-05-059-92/+126
| * | GFS2: glock livelockBob Peterson2010-04-147-29/+144
| * | GFS2: Clean up stuffed file copyingSteven Whitehouse2010-03-292-10/+15
| * | GFS2: docs updateAndrea Gelmini2010-03-291-6/+6
| * | GFS2: Remove space from slab cache nameSteven Whitehouse2010-03-291-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei...Linus Torvalds2010-05-212-18/+75
|\ \ \
| * | | dlm: fix ast ordering for user locksDavid Teigland2010-04-301-14/+74
| * | | dlm: cleanup remove unused codeDan Carpenter2010-04-301-4/+1
* | | | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2010-05-21117-1647/+10156
|\ \ \ \
| * | | | mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chipsGuillaume LECERF2010-05-202-0/+4
| * | | | mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset IDDavid Woodhouse2010-05-201-0/+3
| * | | | mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case valueDavid Woodhouse2010-05-201-1/+0
| * | | | mtd: update gfp/slab.h includesTejun Heo2010-05-193-0/+3
| * | | | jffs2: Stop triggering block erases from jffs2_write_super()Joakim Tjernlund2010-05-191-4/+0
| * | | | jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()Joakim Tjernlund2010-05-192-3/+2
| * | | | jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erasesDavid Woodhouse2010-05-195-10/+12