diff options
| author | Len Brown | 2010-10-25 08:10:36 +0200 |
|---|---|---|
| committer | Len Brown | 2010-10-25 08:10:36 +0200 |
| commit | aca209e5e654951a3a90f5aaa8e04e0c470993b4 (patch) | |
| tree | 5de472175d8edcbdf7a98022af7bf650bde761e9 /drivers/of | |
| parent | Linux 2.6.36 (diff) | |
| parent | Subject: [PATCH] ACPICA: Fix Scope() op in module level code (diff) | |
| download | kernel-qcow2-linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.tar.gz kernel-qcow2-linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.tar.xz kernel-qcow2-linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.zip | |
Merge branch 'acpica' into release
Conflicts:
drivers/acpi/acpica/aclocal.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/of')
0 files changed, 0 insertions, 0 deletions