diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-28 10:37:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-28 10:37:46 -0800 |
| commit | 1842c7f260dd24dad2dd8eded80904d7a6c5525f (patch) | |
| tree | aff68702c9477c21b26284346ba98feebc91d849 /drivers/acpi/processor_perflib.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | [POWERPC] PS3: Fix printing of os-area magic numbers (diff) | |
| download | linux-dev-1842c7f260dd24dad2dd8eded80904d7a6c5525f.tar.xz linux-dev-1842c7f260dd24dad2dd8eded80904d7a6c5525f.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] PS3: Fix printing of os-area magic numbers
[POWERPC] Oprofile: Remove dependency on spufs module
Diffstat (limited to 'drivers/acpi/processor_perflib.c')
0 files changed, 0 insertions, 0 deletions