David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	arch/microblaze/include/asm/socket.h

2009-08-12 17:44:53 -07:00

..

ast.c

…

ast.h

…

config.c

…

config.h

…

debug_fs.c

…

dir.c

dlm: use more NOFS allocation

2009-05-15 11:24:59 -05:00

dir.h

…

dlm_internal.h

…

Kconfig

…

lock.c

dlm: Fix uninitialised variable warning in lock.c

2009-06-17 11:31:32 -05:00

lock.h

…

lockspace.c

…

lockspace.h

…

lowcomms.c

dlm: free socket in error exit path

2009-07-14 12:28:43 -05:00

lowcomms.h

dlm: connect to nodes earlier

2009-05-15 09:34:12 -05:00

lvb_table.h

…

main.c

…

Makefile

…

member.c

dlm: use more NOFS allocation

2009-05-15 11:24:59 -05:00

member.h

…

memory.c

…

memory.h

…

midcomms.c

…

midcomms.h

…

netlink.c

genetlink: make netns aware

2009-07-12 14:03:27 -07:00

plock.c

dlm: fix plock use-after-free

2009-06-18 13:42:42 -05:00

rcom.c

…

rcom.h

…

recover.c

…

recover.h

…

recoverd.c

…

recoverd.h

…

requestqueue.c

dlm: use more NOFS allocation

2009-05-15 11:24:59 -05:00

requestqueue.h

…

user.c

…

user.h

…

util.c

…

util.h

…