diff options
| author | Ingo Molnar | 2009-02-13 09:34:07 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-02-13 09:34:07 +0100 |
| commit | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (patch) | |
| tree | 7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63 /arch/x86/pci/pcbios.c | |
| parent | perfcounters: fix refcounting bug, take 2 (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
| download | kernel-qcow2-linux-e9c4ffb11f0b19005b5b9dc8481687a3637e5887.tar.gz kernel-qcow2-linux-e9c4ffb11f0b19005b5b9dc8481687a3637e5887.tar.xz kernel-qcow2-linux-e9c4ffb11f0b19005b5b9dc8481687a3637e5887.zip | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/acpi/boot.c
Diffstat (limited to 'arch/x86/pci/pcbios.c')
0 files changed, 0 insertions, 0 deletions