Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel (c613bbba) · 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
		--- -----------------

+11 −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
		@@ -1760,6 +1760,13 @@ L: linuxppc-dev@ozlabs.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		FREESCALE IMX / MXC FRAMEBUFFER DRIVER
		P: Sascha Hauer
		M: kernel@pengutronix.de
		L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		FREESCALE SOC FS_ENET DRIVER
		P: Pantelis Antoniou
		M: pantelis.antoniou@gmail.com

+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;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -116,6 +116,8 @@ EXPORT_SYMBOL(__strnlen_user);
		EXPORT_SYMBOL(__strncpy_from_user);

		#ifdef CONFIG_MMU
		EXPORT_SYMBOL(copy_page);

		EXPORT_SYMBOL(__copy_from_user);
		EXPORT_SYMBOL(__copy_to_user);
		EXPORT_SYMBOL(__clear_user);
		@@ -182,8 +184,6 @@ EXPORT_SYMBOL(_find_first_bit_be);
		EXPORT_SYMBOL(_find_next_bit_be);
		#endif

		EXPORT_SYMBOL(copy_page);

		#ifdef CONFIG_FUNCTION_TRACER
		EXPORT_SYMBOL(mcount);
		#endif

+1 −0