Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (eb14f019) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/arm/mem_alignment

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user
		space, and might cause programs to fail unexpectedly.

		To change the alignment trap behavior, simply echo a number into
		/proc/sys/debug/alignment. The number is made up from various bits:
		/proc/cpu/alignment. The number is made up from various bits:

		bit behavior when set
		--- -----------------

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data)
		int cpu;

		/* Increment the counters */
		on_each_cpu(test_each, NULL, 0, 1);
		on_each_cpu(test_each, NULL, 1);
		/* Read all the counters */
		printk("Counters read from CPU %d\n", smp_processor_id());
		for_each_online_cpu(cpu) {

+13 −4

Original line number	Diff line number	Diff line
		@@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/
		S: Maintained

		ECRYPT FILE SYSTEM
		P: Mike Halcrow, Phillip Hellewell
		M: mhalcrow@us.ibm.com, phillip@hellewell.homeip.net
		L: ecryptfs-devel@lists.sourceforge.net
		W: http://ecryptfs.sourceforge.net/
		P: Tyler Hicks, Dustin Kirkland
		M: tyhicks@linux.vnet.ibm.com, kirkland@canonical.com
		L: ecryptfs-devel@lists.launchpad.net
		W: https://launchpad.net/ecryptfs
		S: Supported

		EDAC-CORE
		@@ -3764,6 +3764,15 @@ M: drzeus-sdhci@drzeus.cx
		L: sdhci-devel@list.drzeus.cx
		S: Maintained

		SECURITY SUBSYSTEM
		F: security/
		P: James Morris
		M: jmorris@namei.org
		L: linux-kernel@vger.kernel.org
		L: linux-security-module@vger.kernel.org (suggested Cc:)
		T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
		S: Supported

		SECURITY CONTACT
		P: Security Officers
		M: security@kernel.org

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -630,7 +630,7 @@ __sa1111_probe(struct device me, struct resource mem, int irq)
		return -ENOMEM;

		sachip->clk = clk_get(me, "SA1111_CLK");
		if (!sachip->clk) {
		if (IS_ERR(sachip->clk)) {
		ret = PTR_ERR(sachip->clk);
		goto err_free;
		}