diff options
| author | Linus Torvalds | 2011-05-18 13:25:57 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-18 13:25:57 -0700 |
| commit | fce519588acfac249e8fdc1f5016c73d617de315 (patch) | |
| tree | bea37c564c552cf69344c3bab7156308df7de662 /drivers/acpi | |
| parent | 7103dbed8e462f2a065381d23fde086cbd5b9891 (diff) | |
| parent | b1608d69cb804e414d0887140ba08a9398e4e638 (diff) | |
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/acpi')
0 files changed, 0 insertions, 0 deletions