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

Commit f2d40cd9 authored by David Woodhouse's avatar David Woodhouse
Browse files

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

parents 3ca135e1 7a883eaf

Documentation/Changes

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ o nfs-utils 1.0.5 # showmount --version 
o  procps                 3.2.0                   # ps --version

o  oprofile               0.9                     # oprofiled --version

o  udev                   081                     # udevinfo -V

o  grub                   0.93                    # grub --version



Kernel compilation

==================

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3754,7 +3754,7 @@ L: linux-usb-devel@lists.sourceforge.net 
W:	http://www.linux-usb.org/gadget

S:	Maintained



USB HID/HIDBP DRIVERS

USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)

P:	Jiri Kosina

M:	jkosina@suse.cz

L:	linux-usb-devel@lists.sourceforge.net

arch/frv/mb93090-mb00/pci-vdk.c

+2 −1
Original line number Diff line number Diff line
@@ -400,7 +400,8 @@ int __init pcibios_init(void) 
	__reg_MB86943_pci_sl_mem_base	= __region_CS2 + 0x08000000;

	mb();



	*(volatile unsigned long *)(__region_CS2+0x01300014) == 1;

	/* enable PCI arbitration */

	__reg_MB86943_pci_arbiter	= MB86943_PCIARB_EN;



	ioport_resource.start	= (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00;

	ioport_resource.end	= (__reg_MB86943_sl_pci_io_range << 9) | 0x3ff;

arch/i386/boot/edd.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei) 
	ax = 0x4800;

	dx = devno;

	asm("pushfl; int $0x13; popfl"

	    : "+a" (ax), "+d" (dx)

	    : "+a" (ax), "+d" (dx), "=m" (ei->params)

	    : "S" (&ei->params)

	    : "ebx", "ecx", "edi");

arch/i386/boot/video-vesa.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void vesa_store_edid(void) 
	dx = 0;			/* EDID block number */

	di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */

	asm(INT10

	    : "+a" (ax), "+b" (bx), "+d" (dx)

	    : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info)

	    : "c" (cx), "D" (di)

	    : "esi");

#endif /* CONFIG_FIRMWARE_EDID */