tree 6811915fddffdcacfc929d5a46800ced6f9b3db4
parent 21eb4fa1700112d1420d72e1de708af671a251c8
parent 07b2463046247ce580ff9b37e91394f2f6424768
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170957888 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170957888 -0800

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"