David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-04-23 23:15:17 -04:00

..

cluster

sock: Introduce named constants for sk_reuse

2012-04-21 15:52:25 -04:00

dlm

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2011-12-01 14:55:34 -08:00

dlmfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

acl.c

switch posix_acl_equiv_mode() to umode_t *

2011-08-01 02:10:06 -04:00

acl.h

fs: take the ACL checks to common code

2011-07-25 14:30:23 -04:00

alloc.c

ocfs2: ->l_next_free_req breakage on big-endian

2012-04-13 12:31:37 -04:00

alloc.h

…

aops.c

ocfs2: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:25 +08:00

aops.h

ocfs2: serialize unaligned aio

2011-07-28 02:07:16 -07:00

blockcheck.c

…

blockcheck.h

…

buffer_head_io.c

…

buffer_head_io.h

…

dcache.c

…

dcache.h

…

dir.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2011-12-01 14:55:34 -08:00

dir.h

…

dlmglue.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2011-12-01 14:55:34 -08:00

dlmglue.h

…

export.c

…

export.h

…

extent_map.c

ocfs2: Implement llseek()

2011-07-25 14:58:15 -07:00

extent_map.h

ocfs2: Implement llseek()

2011-07-25 14:58:15 -07:00

file.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-01-08 13:21:22 -08:00

file.h

…

heartbeat.c

…

heartbeat.h

…

inode.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2011-12-01 14:55:34 -08:00

inode.h

ocfs2: serialize unaligned aio

2011-07-28 02:07:16 -07:00

ioctl.c

get rid of pointless includes of ext2_fs.h

2012-03-31 16:03:15 -04:00

ioctl.h

…

journal.c

ocfs2: Add comment about orphan scanning

2011-07-24 10:35:54 -07:00

journal.h

ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2

2011-11-17 01:46:48 -08:00

Kconfig

…

localalloc.c

…

localalloc.h

…

locks.c

…

locks.h

…

Makefile

…

mmap.c

ocfs2: Fix ocfs2_page_mkwrite()

2011-07-24 10:36:54 -07:00

mmap.h

…

move_extents.c

vfs: mnt_drop_write_file()

2012-01-03 22:52:40 -05:00

move_extents.h

…

namei.c

ocfs2: deal with wraparounds of i_nlink in ocfs2_rename()

2012-02-13 20:45:39 -05:00

namei.h

…

ocfs1_fs_compat.h

…

ocfs2_fs.h

…

ocfs2_ioctl.h

…

ocfs2_lockid.h

…

ocfs2_lockingver.h

…

ocfs2_trace.h

…

ocfs2.h

ocfs2: avoid unaligned access to dqc_bitmap

2011-12-01 14:39:32 -08:00

quota_global.c

…

quota_local.c

ocfs2: avoid unaligned access to dqc_bitmap

2011-12-01 14:39:32 -08:00

quota.h

…

refcounttree.c

ocfs2: ->rl_count endianness breakage

2012-04-13 12:31:41 -04:00

refcounttree.h

…

reservations.c

…

reservations.h

…

resize.c

…

resize.h

…

slot_map.c

ocfs2: Clean up messages in the fs

2011-07-24 10:34:54 -07:00

slot_map.h

…

stack_o2cb.c

ocfs2/cluster: Cluster up now includes network connections too

2011-07-24 10:33:54 -07:00

stack_user.c

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

stackglue.c

…

stackglue.h

…

suballoc.c

ocfs2: ->e_leaf_clusters endianness breakage

2012-04-13 12:31:43 -04:00

suballoc.h

…

super.c

ocfs2: fix leaks on failure exits in module_init

2012-03-20 21:29:49 -04:00

super.h

treewide: use __printf not __attribute__((format(printf,...)))

2011-10-31 17:30:54 -07:00

symlink.c

…

symlink.h

…

sysfile.c

…

sysfile.h

…

uptodate.c

…

uptodate.h

…

ver.c

…

ver.h

…

xattr.c

ocfs2: propagate umode_t

2012-01-03 22:55:02 -05:00

xattr.h

ocfs2: propagate umode_t

2012-01-03 22:55:02 -05:00