From: David S. Miller <davem@davemloft.net>
Date: Tue, 24 Apr 2012 03:14:36 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.5-rc1~109^2~304
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f24001941c99776f41bd3f09c07d91205c2ad9d4;p=pandora-kernel.git

Merge git://git./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>
---

f24001941c99776f41bd3f09c07d91205c2ad9d4
Reading git-diff-tree failed