diff options
| author | Len Brown | 2009-04-05 08:14:15 +0200 |
|---|---|---|
| committer | Len Brown | 2009-04-05 08:14:15 +0200 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /drivers/acpi/cm_sbs.c | |
| parent | Merge branch 'misc' into release (diff) | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | kernel-qcow2-linux-478c6a43fcbc6c11609f8cee7c7b57223907754f.tar.gz kernel-qcow2-linux-478c6a43fcbc6c11609f8cee7c7b57223907754f.tar.xz kernel-qcow2-linux-478c6a43fcbc6c11609f8cee7c7b57223907754f.zip | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/cm_sbs.c')
0 files changed, 0 insertions, 0 deletions