Merge branch 'omap3-upstream' of... (7e1548a5) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/local_ops.txt

+1 −1

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

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

MAINTAINERS

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -779,6 +779,7 @@ ATM
	P: Chas Williams		P: Chas Williams
	M: chas@cmf.nrl.navy.mil		M: chas@cmf.nrl.navy.mil
	L: linux-atm-general@lists.sourceforge.net (subscribers-only)		L: linux-atm-general@lists.sourceforge.net (subscribers-only)
			L: netdev@vger.kernel.org
	W: http://linux-atm.sourceforge.net		W: http://linux-atm.sourceforge.net
	S: Maintained		S: Maintained

	@@ -3758,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx
	L: sdhci-devel@list.drzeus.cx		L: sdhci-devel@list.drzeus.cx
	S: Maintained		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		SECURITY CONTACT
	P: Security Officers		P: Security Officers
	M: security@kernel.org		M: security@kernel.org
	@@ -4235,7 +4245,7 @@ M: dedekind@infradead.org
	P: Adrian Hunter		P: Adrian Hunter
	M: ext-adrian.hunter@nokia.com		M: ext-adrian.hunter@nokia.com
	L: linux-mtd@lists.infradead.org		L: linux-mtd@lists.infradead.org
	T: git git://git.infradead.org/~dedekind/ubifs-2.6.git		T: git git://git.infradead.org/ubifs-2.6.git
	W: http://www.linux-mtd.infradead.org/doc/ubifs.html		W: http://www.linux-mtd.infradead.org/doc/ubifs.html
	S: Maintained		S: Maintained

	@@ -4289,7 +4299,7 @@ P: Artem Bityutskiy
	M: dedekind@infradead.org		M: dedekind@infradead.org
	W: http://www.linux-mtd.infradead.org/		W: http://www.linux-mtd.infradead.org/
	L: linux-mtd@lists.infradead.org		L: linux-mtd@lists.infradead.org
	T: git git://git.infradead.org/~dedekind/ubi-2.6.git		T: git git://git.infradead.org/ubi-2.6.git
	S: Maintained		S: Maintained

	USB ACM DRIVER		USB ACM DRIVER

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 28		SUBLEVEL = 28
	EXTRAVERSION = -rc7		EXTRAVERSION = -rc8
	NAME = Erotic Pickled Herring		NAME = Erotic Pickled Herring

	# DOCUMENTATION		# DOCUMENTATION