From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 8 Feb 2007 18:04:48 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.21-rc2~42^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=43187902cbfafe73ede0144166b741fb0f7d04e1;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Revert "Driver core: convert SPI code to use struct device"
---

43187902cbfafe73ede0144166b741fb0f7d04e1