summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-03-2842-1626/+3855
|\
| * Treat writes as new when holes span across page boundariesGoldwyn Rodrigues2011-03-281-0/+6
| * Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs...Joel Becker2011-03-28712-6503/+11917
| |\
| | * ocfs2: Make the left masklogs compat.Tao Ma2011-02-211-17/+17
| | * ocfs2: Remove masklog ML_AIO.Tao Ma2011-02-212-2/+0
| | * ocfs2: Remove masklog ML_UPTODATE.Tao Ma2011-02-245-41/+79
| | * ocfs2: Remove masklog ML_BH_IO.Tao Ma2011-02-244-26/+59
| | * ocfs2: Remove masklog ML_JOURNAL.Tao Ma2011-02-244-78/+153
| | * ocfs2: Remove masklog ML_EXPORT.Tao Ma2011-02-244-30/+101
| | * ocfs2: Remove masklog ML_DCACHE.Tao Ma2011-02-234-24/+121
| | * ocfs2: Remove masklog ML_NAMEI.Tao Ma2011-02-234-71/+292
| | * ocfs2: Remove mlog(0) from fs/ocfs2/dir.cTao Ma2011-02-232-46/+153
| | * ocfs2: remove NAMEI from symlink.cTao Ma2011-02-211-1/+0
| | * ocfs2: Remove masklog ML_QUOTA.Tao Ma2011-02-234-14/+90
| | * ocfs2: Remove mlog(0) from quota_local.c.Tao Ma2011-02-232-6/+17
| | * ocfs2: Remove masklog ML_RESERVATIONS.Tao Ma2011-02-234-33/+142
| | * ocfs2: Remove masklog ML_XATTR.Tao Ma2011-02-234-80/+239
| | * ocfs2: Remove masklog ML_SUPER.Tao Ma2011-02-234-21/+118
| | * ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.cTao Ma2011-02-232-2/+9
| | * ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.cTao Ma2011-02-222-8/+16
| | * ocfs2: Remove masklog ML_EXTENT_MAP.Tao Ma2011-02-224-5/+31
| | * ocfs2: Remove masklog ML_INODE.Tao Ma2011-02-224-63/+182
| | * ocfs2: Little refactoring against ocfs2_iget.Tao Ma2011-02-211-5/+5
| | * ocfs2: Remove mlog(0) from fs/ocfs2/file.cTao Ma2011-02-223-98/+330
| | * ocfs2: remove INODE from unused files.Tao Ma2011-02-213-3/+0
| | * ocfs2: Remove FILE_IO from masklog.Tao Ma2011-02-224-6/+28
| | * ocfs2: Remove mlog(0) from fs/ocfs2/aops.cTao Ma2011-02-222-26/+153
| | * ocfs2: Remove masklog ML_REFCOUNT.Tao Ma2011-02-224-82/+341
| | * ocfs2: Remove DISK_ALLOC from masklog.Tao Ma2011-02-226-6/+0
| | * ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.cTao Ma2011-02-222-5/+17
| | * ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.cTao Ma2011-02-222-54/+265
| | * ocfs2: Remove mlog(0) from fs/ocfs2/localalloc.cTao Ma2011-02-222-34/+135
| | * ocfs2: Remove mlog(0) from fs/ocfs2/alloc.cTao Ma2011-02-222-77/+452
| | * ocfs2: Add ocfs2_trace.h.Wengang Wang2011-02-212-0/+19
| | * ocfs2: Remove EXIT from masklog.Tao Ma2011-03-0727-315/+159
| | * ocfs2: Remove ENTRY from masklog.Tao Ma2011-02-2131-418/+161
| * | fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS.Rakib Mullick2011-03-281-5/+5
| * | ocfs2/dlm: Move kmalloc() outside the spinlockSunil Mushran2011-02-221-12/+16
| * | Ocfs2: Using macro to set/clear *FILLED* flags in info handler.Tristan Ye2011-02-201-8/+30
| * | ocfs2: optimize ocfs2_check_dir_entry() with unlikely() annotationsTao Ma2011-02-201-5/+7
| * | ocfs2: Use hrtimer to track ocfs2 fs lock statsSunil Mushran2011-02-202-56/+64
* | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2011-03-285-15/+11
|\ \ \
| * | | NFS: Ensure that rpc_release_resources_task() can be called twice.OGAWA Hirofumi2011-03-271-1/+3
| * | | NFS: Don't leak RPC clients in NFSv4 secinfo negotiationTrond Myklebust2011-03-271-1/+3
| * | | NFS: Fix a hang in the writeback pathTrond Myklebust2011-03-273-13/+5
* | | | MFD: allow cs5535-mfd to build on X86 onlyAndres Salomon2011-03-281-1/+1
* | | | drbd: fix up merge errorLinus Torvalds2011-03-281-8/+6
* | | | Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-03-283-72/+32
|\ \ \ \
| * | | | tile: Use generic show_interupts()Thomas Gleixner2011-03-252-41/+1
| * | | | tile: Convert to new irq function namesThomas Gleixner2011-03-251-3/+3