git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jeff Garzik <jeff@garzik.org>
	Wed, 25 Jul 2012 19:58:48 +0000 (15:58 -0400)
committer	Jeff Garzik <jgarzik@redhat.com>
	Wed, 25 Jul 2012 19:58:48 +0000 (15:58 -0400)
commit	6f11684ddd8f89f0d9b69c20e300c19c493903f9
tree	b6ea42c231d7d39f454de28a068d78ce11709770	tree \| snapshot
parent	cd747f495b4696f0e632c20e2830723eb28b48b1	commit \| diff
parent	c4ad06bffe2ebea8d8d2192ae53cff2ba951f4e5	commit \| diff

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

Two bits were appended to the end of the bitfield
list in struct scsi_device. Resolve that conflict
by including both bits.

Conflicts:
include/scsi/scsi_device.h

drivers/acpi/power.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-eh.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
include/linux/libata.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_device.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/acpi/power.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-eh.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
include/linux/libata.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_device.h	diff1 \|	diff2 \|	blob \| history