diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 15:35:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 15:35:30 -0800 |
| commit | ec2f9d1331f658433411c58077871e1eef4ee1b4 (patch) | |
| tree | 6d0e5f6665e5c89ee392379967a52e6fcae17cf2 /drivers/acpi/battery.c | |
| parent | 89697f1d715e20fff0361cca79efd5a371623af7 (diff) | |
| parent | 34cc560e6a72ff414ff7d107426a411b0a093ad3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Re-export saved_command_line to modules.
[SPARC64]: Increase command line size to 2048 like other arches.
[SPARC64]: We do not need ZONE_DMA.
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions