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

Commit d78fef14 authored by Len Brown's avatar Len Brown
Browse files

Pull linus into release branch

parents 04348e69 88026842

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 15

EXTRAVERSION =-rc7

EXTRAVERSION =

NAME=Sliding Snow Leopard



# *DOCUMENTATION*

arch/i386/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -554,7 +554,9 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs) 
	struct pt_regs ptregs;

	

	ptregs = *(struct pt_regs *)

		((unsigned long)tsk->thread_info+THREAD_SIZE - sizeof(ptregs));

		((unsigned long)tsk->thread_info +

		/* see comments in copy_thread() about -8 */

		THREAD_SIZE - sizeof(ptregs) - 8);

	ptregs.xcs &= 0xffff;

	ptregs.xds &= 0xffff;

	ptregs.xes &= 0xffff;

drivers/input/joystick/warrior.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv) 
	input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8);

	input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0);

	input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);

	input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);

	input_set_abs_params(input_dev, ABS_HAT0Y, -1, 1, 0, 0);



	serio_set_drvdata(serio, warrior);

drivers/macintosh/therm_pm72.c

+3 −3
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static void do_monitor_cpu_combined(void) 
	if (temp_combi >= ((state0->mpu.tmax + 8) << 16)) {

		printk(KERN_WARNING "Warning ! Temperature way above maximum (%d) !\n",

		       temp_combi >> 16);

		state0->overtemp = CPU_MAX_OVERTEMP;

		state0->overtemp += CPU_MAX_OVERTEMP / 4;

	} else if (temp_combi > (state0->mpu.tmax << 16))

		state0->overtemp++;

	else
@@ -998,7 +998,7 @@ static void do_monitor_cpu_split(struct cpu_pid_state *state) 
		printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum"

		       " (%d) !\n",

		       state->index, temp >> 16);

		state->overtemp = CPU_MAX_OVERTEMP;

		state->overtemp += CPU_MAX_OVERTEMP / 4;

	} else if (temp > (state->mpu.tmax << 16))

		state->overtemp++;

	else
@@ -1060,7 +1060,7 @@ static void do_monitor_cpu_rack(struct cpu_pid_state *state) 
		printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum"

		       " (%d) !\n",

		       state->index, temp >> 16);

		state->overtemp = CPU_MAX_OVERTEMP;

		state->overtemp = CPU_MAX_OVERTEMP / 4;

	} else if (temp > (state->mpu.tmax << 16))

		state->overtemp++;

	else

drivers/serial/pxa.c

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count) 
	int i;



	/*

	 *	First save the UER then disable the interrupts

	 *	First save the IER then disable the interrupts

	 */

	ier = serial_in(up, UART_IER);

	serial_out(up, UART_IER, UART_IER_UUE);