summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26Linus Torvalds2008-04-181-3/+3
|\
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2008-04-1738-228/+254
| |\
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...David S. Miller2008-04-0355-718/+687
| |\ \
| * | | [NETNS]: Remove ifdef CONFIG_NET braces in fs/proc/proc_net.c.Denis V. Lunev2008-04-021-2/+0
| * | | [NETNS]: Compile NET /proc support only if CONFIG_NET is set.Denis V. Lunev2008-03-271-0/+2
| * | | [NET] NETNS: Omit seq_net_private->net without CONFIG_NET_NS.YOSHIFUJI Hideaki2008-03-261-3/+3
* | | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-04-1842-1042/+5679
|\ \ \ \
| * | | | ocfs2/net: Add debug interface to o2netSunil Mushran2008-04-186-3/+569
| * | | | ocfs2: Only build ocfs2/dlm with the o2cb stack moduleMark Fasheh2008-04-181-1/+1
| * | | | ocfs2/cluster: Get rid of arguments to the timeout routinesJeff Mahoney2008-04-181-27/+20
| * | | | ocfs2: Use BUG_ONJulia Lawall2008-04-182-4/+2
| * | | | ocfs2: Convert ocfs2 over to unlocked_ioctlAndi Kleen2008-04-183-13/+6
| * | | | ocfs2: Improve rename lockingJan Kara2008-04-181-1/+1
| * | | | fs/ocfs2/aops.c: test for IS_ERR rather than 0Julia Lawall2008-04-181-3/+3
| * | | | ocfs2: Add inode stealing for ocfs2_reserve_new_inodeTao Ma2008-04-186-5/+116
| * | | | ocfs2: Add ac_alloc_slot in ocfs2_alloc_contextTao Ma2008-04-183-0/+4
| * | | | ocfs2: Add a new parameter for ocfs2_reserve_suballoc_bitsTao Ma2008-04-181-4/+18
| * | | | ocfs2: Enable cross extent block merge.Tao Ma2008-04-181-8/+86
| * | | | ocfs2: Add support for cross extent blockTao Ma2008-04-181-41/+325
| * | | | ocfs2: Move /sys/o2cb to /sys/fs/o2cbMark Fasheh2008-04-181-0/+9
| * | | | sysfs: Allow removal of symlinks in the sysfs rootMark Fasheh2008-04-181-1/+8
| * | | | ocfs2: Reconnect after idle time out.Tao Ma2008-04-182-15/+38
| * | | | ocfs2/dlm: Cleanup lockres printSunil Mushran2008-04-181-11/+11
| * | | | ocfs2/dlm: Fix lockname in lockres print functionSunil Mushran2008-04-181-75/+51
| * | | | ocfs2/dlm: Move dlm_print_one_mle() from dlmmaster.c to dlmdebug.cSunil Mushran2008-04-183-160/+85
| * | | | ocfs2/dlm: Dumps the purgelist into a debugfs fileSunil Mushran2008-04-182-0/+72
| * | | | ocfs2/dlm: Dumps the mles into a debugfs fileSunil Mushran2008-04-182-0/+120
| * | | | ocfs2/dlm: Move struct dlm_master_list_entry to dlmcommon.hSunil Mushran2008-04-182-37/+35
| * | | | ocfs2/dlm: Dumps the lockres' into a debugfs fileSunil Mushran2008-04-182-0/+255
| * | | | ocfs2/dlm: Dump the dlm state in a debugfs fileSunil Mushran2008-04-184-0/+325
| * | | | ocfs2/dlm: Create debugfs dirsSunil Mushran2008-04-184-2/+125
| * | | | ocfs2/dlm: Link all lockres' to a tracking listSunil Mushran2008-04-183-0/+26
| * | | | ocfs2/dlm: Create slabcaches for lock and lockresSunil Mushran2008-04-184-17/+99
| * | | | ocfs2/dlm: Rename slabcache dlm_mle_cache to o2dlm_mleSunil Mushran2008-04-182-2/+4
| * | | | ocfs2: Allow selection of cluster plug-ins.Joel Becker2008-04-182-4/+32
| * | | | ocfs2: Add kbuild for ocfs2_stack_user.koJoel Becker2008-04-181-1/+6
| * | | | ocfs2: Change mlog_bug_on to BUG_ON in ocfs2_lockid.hJoel Becker2008-04-181-1/+1
| * | | | ocfs2: add fsdlm to stackglueDavid Teigland2008-04-183-6/+243
| * | | | ocfs2: Add the 'set version' message to the ocfs2_control device.Joel Becker2008-04-181-12/+119
| * | | | ocfs2: Add the local node id to the handshake.Joel Becker2008-04-181-49/+173
| * | | | ocfs2: Introduce the DOWN message to ocfs2_controlJoel Becker2008-04-181-5/+89
| * | | | ocfs2: Start the ocfs2_control handshake.Joel Becker2008-04-181-5/+139
| * | | | ocfs2: Add the ocfs2_control misc device.Joel Becker2008-04-181-1/+183
| * | | | ocfs2: Add the user stack module.Joel Becker2008-04-181-0/+38
| * | | | ocfs2: Add the 'cluster_stack' sysfs file.Joel Becker2008-04-183-13/+104
| * | | | ocfs2: Add the USERSPACE_STACK incompat bit.Joel Becker2008-04-183-3/+134
| * | | | ocfs2: Create stack glue sysfs files.Joel Becker2008-04-181-1/+120
| * | | | ocfs2: Break out stackglue into modules.Joel Becker2008-04-187-50/+297
| * | | | ocfs2: Create ocfs2_stack_operations and split out the o2cb stack.Joel Becker2008-04-184-372/+532
| * | | | ocfs2: Split o2cb code from generic stack functions.Joel Becker2008-04-181-65/+144
OpenPOWER on IntegriCloud