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

Commit c8a4f06e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 4ab43267 5666c094

Documentation/usb/error-codes.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -46,8 +46,9 @@ USB-specific: 




-EMSGSIZE	(a) endpoint maxpacket size is zero; it is not usable

-EMSGSIZE	(a) endpoint maxpacket size is zero; it is not usable

		    in the current interface altsetting.

		    in the current interface altsetting.

		(b) ISO packet is biger than endpoint maxpacket

		(b) ISO packet is larger than the endpoint maxpacket.

		(c) requested data transfer size is invalid (negative)

		(c) requested data transfer length is invalid: negative

		    or too large for the host controller.





-ENOSPC		This request would overcommit the usb bandwidth reserved

-ENOSPC		This request would overcommit the usb bandwidth reserved

		for periodic transfers (interrupt, isochronous).

		for periodic transfers (interrupt, isochronous).

Makefile

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

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 15

SUBLEVEL = 15

EXTRAVERSION =-rc3

EXTRAVERSION =-rc4

NAME=Affluent Albatross

NAME=Affluent Albatross





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/i386/kernel/io_apic.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2009,7 +2009,7 @@ static void ack_edge_ioapic_vector(unsigned int vector) 
{

{

	int irq = vector_to_irq(vector);

	int irq = vector_to_irq(vector);





	move_irq(vector);

	move_native_irq(vector);

	ack_edge_ioapic_irq(irq);

	ack_edge_ioapic_irq(irq);

}

}
@@ -2024,7 +2024,7 @@ static void end_level_ioapic_vector (unsigned int vector) 
{

{

	int irq = vector_to_irq(vector);

	int irq = vector_to_irq(vector);





	move_irq(vector);

	move_native_irq(vector);

	end_level_ioapic_irq(irq);

	end_level_ioapic_irq(irq);

}

}

arch/i386/kernel/reboot.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),

			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),

		},

		},

	},

	},

	{	/* Handle problems with rebooting on HP nc6120 */

		.callback = set_bios_reboot,

		.ident = "HP Compaq nc6120",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6120"),

		},

	},

	{ }

	{ }

};

};

arch/ia64/kernel/ia64_ksyms.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ EXPORT_SYMBOL(clear_page); 




#ifdef CONFIG_VIRTUAL_MEM_MAP

#ifdef CONFIG_VIRTUAL_MEM_MAP

#include <linux/bootmem.h>

#include <linux/bootmem.h>

EXPORT_SYMBOL(min_low_pfn);	/* defined by bootmem.c, but not exported by generic code */

EXPORT_SYMBOL(max_low_pfn);	/* defined by bootmem.c, but not exported by generic code */

EXPORT_SYMBOL(max_low_pfn);	/* defined by bootmem.c, but not exported by generic code */

#endif

#endif