]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f88c1e8 34011fd)
Merge branch 'stable/not-upstreamed.drivers' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 05:20:40 +0000 (00:20 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 05:20:40 +0000 (00:20 -0500)
* stable/not-upstreamed.drivers:
  usb: xen pvusb driver
  xen/scsi[front|back]: consolidate and simplify struct xenbus_driver instantiation
  xen/scsiback: allow RESERVE/RELEASE commands
  xen/scsiback: vscsi >2TB patch
  xen-scsi[front|back]: Fix warnings and bugs.
  xen/scsi[front|back]: Forgot .owner attribute.
  xen/scsi[front|back]: Initial commit from Novell SLES11SP1 2.6.32 tree.

1  2 
drivers/scsi/Kconfig patch | diff1 | diff2 | blob | history
drivers/scsi/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/Kconfig
Simple merge
diff --cc drivers/scsi/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.