Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b608055 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes 

* 'fixes' of git://github.com/hzhuang1/linux: (3 commits)
  ARM: pxa: fix invalid mfp pin issue
  ARM: pxa: remove duplicated registeration on pxa-gpio
  ARM: pxa: add dummy clock for pxa25x and pxa27x

Includes an update to v3.3-rc6
parents 4c75aab6 af829310

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -3780,7 +3780,7 @@ F: Documentation/kdump/ 


KERNEL AUTOMOUNTER v4 (AUTOFS4)

M:	Ian Kent <raven@themaw.net>

L:	autofs@linux.kernel.org

L:	autofs@vger.kernel.org

S:	Maintained

F:	fs/autofs4/
@@ -4685,7 +4685,7 @@ NTFS FILESYSTEM 
M:	Anton Altaparmakov <anton@tuxera.com>

L:	linux-ntfs-dev@lists.sourceforge.net

W:	http://www.tuxera.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git

S:	Supported

F:	Documentation/filesystems/ntfs.txt

F:	fs/ntfs/
@@ -7271,7 +7271,7 @@ WATCHDOG DEVICE DRIVERS 
M:	Wim Van Sebroeck <wim@iguana.be>

L:	linux-watchdog@vger.kernel.org

W:	http://www.linux-watchdog.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

T:	git git://www.linux-watchdog.org/linux-watchdog.git

S:	Maintained

F:	Documentation/watchdog/

F:	drivers/watchdog/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/mach-omap2/mailbox.c

+2 −1
Original line number Diff line number Diff line
@@ -420,7 +420,8 @@ static void __exit omap2_mbox_exit(void) 
	platform_driver_unregister(&omap2_mbox_driver);

}



module_init(omap2_mbox_init);

/* must be ready before omap3isp is probed */

subsys_initcall(omap2_mbox_init);

module_exit(omap2_mbox_exit);



MODULE_LICENSE("GPL v2");

arch/arm/mach-pxa/generic.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ extern unsigned pxa3xx_get_clk_frequency_khz(int); 
#endif



extern struct syscore_ops pxa_irq_syscore_ops;

extern struct syscore_ops pxa_gpio_syscore_ops;

extern struct syscore_ops pxa2xx_mfp_syscore_ops;

extern struct syscore_ops pxa3xx_mfp_syscore_ops;

arch/arm/mach-pxa/mfp-pxa2xx.c

+7 −0
Original line number Diff line number Diff line
@@ -226,6 +226,12 @@ static void __init pxa25x_mfp_init(void) 
{

	int i;



	/* running before pxa_gpio_probe() */

#ifdef CONFIG_CPU_PXA26x

	pxa_last_gpio = 89;

#else

	pxa_last_gpio = 84;

#endif

	for (i = 0; i <= pxa_last_gpio; i++)

		gpio_desc[i].valid = 1;
@@ -295,6 +301,7 @@ static void __init pxa27x_mfp_init(void) 
{

	int i, gpio;



	pxa_last_gpio = 120;	/* running before pxa_gpio_probe() */

	for (i = 0; i <= pxa_last_gpio; i++) {

		/* skip GPIO2, 5, 6, 7, 8, they are not

		 * valid pins allow configuration