diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 13:25:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 13:25:57 -0700 |
commit | fce519588acfac249e8fdc1f5016c73d617de315 (patch) | |
tree | bea37c564c552cf69344c3bab7156308df7de662 /drivers/scsi/osst_options.h | |
parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | drivercore: revert addition of of_match to struct device (diff) | |
download | linux-dev-fce519588acfac249e8fdc1f5016c73d617de315.tar.xz linux-dev-fce519588acfac249e8fdc1f5016c73d617de315.zip |
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
drivercore: revert addition of of_match to struct device
of: fix race when matching drivers
Diffstat (limited to 'drivers/scsi/osst_options.h')
0 files changed, 0 insertions, 0 deletions