diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 12:49:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 12:49:24 -0500 |
| commit | a12e60621b553e32711f9ad653aad3c92881c400 (patch) | |
| tree | f5b13bddbfa0c98ae2af7fbe85fadef91201dbca /arch/ia64/kernel/acpi.c | |
| parent | aa62a869454c5900687822ee117f2d3494e2ea62 (diff) | |
| parent | 553876c802249b21267b78a9b3857d1341a3df87 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4694/1: IXP4xx: Update clockevent support for shutdown and resume
[ARM] 4710/1: Fix coprocessor 14 usage for debug messages via ICEDCC
[ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code
[ARM] 4667/1: CM-X270 fixes
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
0 files changed, 0 insertions, 0 deletions