diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 09:00:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 09:00:04 -0700 |
| commit | aa9d40de77f8ec734f48d0be0c7fe7732d505af4 (patch) | |
| tree | c505e514944b73c604aaef15e01d39ada076fc98 /drivers/acpi/debug.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again (diff) | |
| download | linux-dev-aa9d40de77f8ec734f48d0be0c7fe7732d505af4.tar.xz linux-dev-aa9d40de77f8ec734f48d0be0c7fe7732d505af4.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] spufs: fix mismerge, making context signal{1,2} files readable again
Diffstat (limited to 'drivers/acpi/debug.c')
0 files changed, 0 insertions, 0 deletions