diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 22:25:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 22:25:57 +0200 |
| commit | fce519588acfac249e8fdc1f5016c73d617de315 (patch) | |
| tree | bea37c564c552cf69344c3bab7156308df7de662 /net | |
| 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-fce519588acfac249e8fdc1f5016c73d617de315.tar.xz linux-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 'net')
0 files changed, 0 insertions, 0 deletions