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

Commit 198d2f63 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 0da2b300 1f474646

MAINTAINERS

+4 −2
Original line number Original line Diff line number Diff line
@@ -3411,8 +3411,10 @@ S: Maintained 
F:	drivers/scsi/sym53c8xx_2/

F:	drivers/scsi/sym53c8xx_2/





LTP (Linux Test Project)

LTP (Linux Test Project)

M:	Subrata Modak <subrata@linux.vnet.ibm.com>

M:	Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>

M:	Garrett Cooper <yanegomi@gmail.com>

M:     Mike Frysinger <vapier@gentoo.org>

M:     Mike Frysinger <vapier@gentoo.org>

M:     Subrata Modak <subrata@linux.vnet.ibm.com>

L:	ltp-list@lists.sourceforge.net (subscribers-only)

L:	ltp-list@lists.sourceforge.net (subscribers-only)

W:	http://ltp.sourceforge.net/

W:	http://ltp.sourceforge.net/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git

Makefile

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

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 33

SUBLEVEL = 33

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Man-Eating Seals of Antiquity

NAME = Man-Eating Seals of Antiquity





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/mach-omap2/mmc-twl4030.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -408,6 +408,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 
{

{

	struct twl4030_hsmmc_info *c;

	struct twl4030_hsmmc_info *c;

	int nr_hsmmc = ARRAY_SIZE(hsmmc_data);

	int nr_hsmmc = ARRAY_SIZE(hsmmc_data);

	int i;





	if (cpu_is_omap2430()) {

	if (cpu_is_omap2430()) {

		control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;

		control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;
@@ -434,7 +435,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 
		mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);

		mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);

		if (!mmc) {

		if (!mmc) {

			pr_err("Cannot allocate memory for mmc device!\n");

			pr_err("Cannot allocate memory for mmc device!\n");

			return;

			goto done;

		}

		}





		if (c->name)

		if (c->name)
@@ -532,6 +533,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) 
			continue;

			continue;

		c->dev = mmc->dev;

		c->dev = mmc->dev;

	}

	}



done:

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

		kfree(hsmmc_data[i]);

}

}





#endif
 
#endif

arch/ia64/include/asm/elf.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,9 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst); 
   relevant until we have real hardware to play with... */

   relevant until we have real hardware to play with... */

#define ELF_PLATFORM	NULL

#define ELF_PLATFORM	NULL





#define SET_PERSONALITY(ex)	set_personality(PER_LINUX)

#define SET_PERSONALITY(ex)	\

	set_personality((current->personality & ~PER_MASK) | PER_LINUX)



#define elf_read_implies_exec(ex, executable_stack)					\

#define elf_read_implies_exec(ex, executable_stack)					\

	((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0)

	((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0)