From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 25 Jul 2012 19:58:48 +0000 (-0400)
Subject: Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
X-Git-Tag: v3.6-rc1~102^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8407884dd9164ec18ed2afc00f56b87e36c51fcf;p=pandora-kernel.git

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
---

8407884dd9164ec18ed2afc00f56b87e36c51fcf
Reading git-diff-tree failed