Merge branch 'acpica' into release (05534c9f) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+9 −2

Original line number	Diff line number	Diff line
		@@ -1692,6 +1692,13 @@ M: Andy Whitcroft <apw@canonical.com>
		S: Supported
		F: scripts/checkpatch.pl

		CHINESE DOCUMENTATION
		M: Harry Wei <harryxiyou@gmail.com>
		L: xiyoulinuxkernelgroup@googlegroups.com
		L: linux-kernel@zh-kernel.org (moderated for non-subscribers)
		S: Maintained
		F: Documentation/zh_CN/

		CISCO VIC ETHERNET NIC DRIVER
		M: Vasanthy Kolluri <vkolluri@cisco.com>
		M: Roopa Prabhu <roprabhu@cisco.com>
		@@ -5266,7 +5273,7 @@ S: Maintained
		F: drivers/net/wireless/rtl818x/rtl8180/

		RTL8187 WIRELESS DRIVER
		M: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
		M: Herton Ronaldo Krzesinski <herton@canonical.com>
		M: Hin-Tak Leung <htl10@users.sourceforge.net>
		M: Larry Finger <Larry.Finger@lwfinger.net>
		L: linux-wireless@vger.kernel.org
		@@ -6104,7 +6111,7 @@ S: Maintained
		F: security/tomoyo/

		TOPSTAR LAPTOP EXTRAS DRIVER
		M: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
		M: Herton Ronaldo Krzesinski <herton@canonical.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: drivers/platform/x86/topstar-laptop.c

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 38
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Flesh-Eating Bats with Fangs

		# DOCUMENTATION

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ static int _dpll_test_fint(struct clk *clk, u8 n)
		dd = clk->dpll_data;

		/* DPLL divider must result in a valid jitter correction val */
		fint = clk->parent->rate / (n + 1);
		fint = clk->parent->rate / n;
		if (fint < DPLL_FINT_BAND1_MIN) {

		pr_debug("rejecting n=%d due to Fint failure, "

+1 −1

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ static struct omap_mbox mbox_iva_info = {
		.priv = &omap2_mbox_iva_priv,
		};

		struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL };
		struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };
		#endif

		#if defined(CONFIG_ARCH_OMAP4)

+1 −1

Original line number	Diff line number	Diff line
		@@ -605,7 +605,7 @@ static void __init omap_mux_dbg_create_entry(
		list_for_each_entry(e, &partition->muxmodes, node) {
		struct omap_mux *m = &e->mux;

		(void)debugfs_create_file(m->muxnames[0], S_IWUGO, mux_dbg_dir,
		(void)debugfs_create_file(m->muxnames[0], S_IWUSR, mux_dbg_dir,
		m, &omap_mux_dbg_signal_fops);
		}
		}