diff options
author | 2009-01-09 04:01:26 -0500 | |
---|---|---|
committer | 2009-01-09 04:56:56 -0500 | |
commit | d97c0defba25a959a990f6d4759f43075540832e (patch) | |
tree | 27dceaf310e01a6bbcceee3550112b19202f142f /drivers/base | |
parent | Merge branch 'simplify_PRT' into release (diff) | |
parent | ACPI: move wmi, asus_acpi, toshiba_acpi to drivers/platform/x86 (diff) | |
download | wireguard-linux-d97c0defba25a959a990f6d4759f43075540832e.tar.xz wireguard-linux-d97c0defba25a959a990f6d4759f43075540832e.zip |
Merge branch 'drivers-platform' into release
Conflicts:
drivers/misc/Kconfig
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions