diff options
author | Len Brown <len.brown@intel.com> | 2010-08-15 05:55:44 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-08-15 05:55:44 +0200 |
commit | f2a66185bed21427d8d347a42eaf0ad1d3d9fc63 (patch) | |
tree | de49c1ea5b87273596725d9bb1b0188ae2bbf3c9 /drivers/uwb/umc-bus.c | |
parent | Linux 2.6.35 (diff) | |
parent | ACPI / Sleep: Drop acpi_suspend_finish() (diff) | |
download | linux-f2a66185bed21427d8d347a42eaf0ad1d3d9fc63.tar.xz linux-f2a66185bed21427d8d347a42eaf0ad1d3d9fc63.zip |
Merge branch 'nvs' into release
Diffstat (limited to 'drivers/uwb/umc-bus.c')
0 files changed, 0 insertions, 0 deletions