projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc7f71f bdc0077)
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 25 Jul 2012 19:58:48 +0000 (15:58 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 25 Jul 2012 19:58:48 +0000 (15:58 -0400)
commit8407884dd9164ec18ed2afc00f56b87e36c51fcf
treeb6ea42c231d7d39f454de28a068d78ce11709770tree | snapshot
parentdc7f71f486f4f5fa96f6dcf86833da020cde8a11commit | diff
parentbdc0077af574800d24318b6945cf2344e8dbb050commit | 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
John Crispins staging tree