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

Commit d59fdcf2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.26' into x86/core

parents 2387ce57 bce7f793

Documentation/HOWTO

+1 −1
Original line number Original line Diff line number Diff line
@@ -377,7 +377,7 @@ Bug Reporting 
bugzilla.kernel.org is where the Linux kernel developers track kernel

bugzilla.kernel.org is where the Linux kernel developers track kernel

bugs.  Users are encouraged to report all bugs that they find in this

bugs.  Users are encouraged to report all bugs that they find in this

tool.  For details on how to use the kernel bugzilla, please see:

tool.  For details on how to use the kernel bugzilla, please see:

	http://test.kernel.org/bugzilla/faq.html

	http://bugzilla.kernel.org/page.cgi?id=faq.html





The file REPORTING-BUGS in the main kernel source directory has a good

The file REPORTING-BUGS in the main kernel source directory has a good

template for how to report a possible kernel bug, and details what kind

template for how to report a possible kernel bug, and details what kind

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -3088,8 +3088,8 @@ L: linux-scsi@vger.kernel.org 
S:	Maintained

S:	Maintained





OPROFILE

OPROFILE

P:	Philippe Elie

P:	Robert Richter

M:	phil.el@wanadoo.fr

M:	robert.richter@amd.com

L:	oprofile-list@lists.sf.net

L:	oprofile-list@lists.sf.net

S:	Maintained

S:	Maintained

Makefile

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

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 26

SUBLEVEL = 26

EXTRAVERSION = -rc9

EXTRAVERSION =

NAME = Rotary Wombat

NAME = Rotary Wombat





# *DOCUMENTATION*

# *DOCUMENTATION*

block/bsg.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -709,11 +709,12 @@ static void bsg_kref_release_function(struct kref *kref) 
{

{

	struct bsg_class_device *bcd =

	struct bsg_class_device *bcd =

		container_of(kref, struct bsg_class_device, ref);

		container_of(kref, struct bsg_class_device, ref);

	struct device *parent = bcd->parent;





	if (bcd->release)

	if (bcd->release)

		bcd->release(bcd->parent);

		bcd->release(bcd->parent);





	put_device(bcd->parent);

	put_device(parent);

}

}





static int bsg_put_device(struct bsg_device *bd)

static int bsg_put_device(struct bsg_device *bd)

drivers/char/pcmcia/ipwireless/hardware.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -590,8 +590,10 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw, 
		packet = kmalloc(sizeof(struct ipw_rx_packet) +

		packet = kmalloc(sizeof(struct ipw_rx_packet) +

				old_packet->length + minimum_free_space,

				old_packet->length + minimum_free_space,

				GFP_ATOMIC);

				GFP_ATOMIC);

		if (!packet)

		if (!packet) {

			kfree(old_packet);

			return NULL;

			return NULL;

		}

		memcpy(packet, old_packet,

		memcpy(packet, old_packet,

				sizeof(struct ipw_rx_packet)

				sizeof(struct ipw_rx_packet)

					+ old_packet->length);

					+ old_packet->length);