diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:42:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:42:42 -0700 |
commit | 7f52a3afc4c02db75b3953fcbbb980abc86873a2 (patch) | |
tree | 7c771c73ee3cfa0bd3d8a9433462919da377ffa2 /drivers/acpi/namespace/nsobject.c | |
parent | 4edc5db83f574dfcc8be35b7b96760ded543b360 (diff) | |
parent | 4f5fa2fb1259f506d20e8af447117ec3ec426a53 (diff) |
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] Bypass hcall stats until cpu features have run
[POWERPC] Avoid hypervisor statistics calculation in real mode
[POWERPC] Fix atomicity of TIF update in flush_thread()
Diffstat (limited to 'drivers/acpi/namespace/nsobject.c')
0 files changed, 0 insertions, 0 deletions