Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Feb 2007 18:04:48 +0000 (10:04 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Feb 2007 18:04:48 +0000 (10:04 -0800)
commit43187902cbfafe73ede0144166b741fb0f7d04e1
tree6811915fddffdcacfc929d5a46800ced6f9b3db4
parent21eb4fa1700112d1420d72e1de708af671a251c8
parent07b2463046247ce580ff9b37e91394f2f6424768
Merge /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"