From: Linus Torvalds Date: Mon, 12 Feb 2007 23:35:30 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.21-rc1~274^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ec2f9d1331f658433411c58077871e1eef4ee1b4;p=linux-2.6-omap-h63xx.git 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. --- ec2f9d1331f658433411c58077871e1eef4ee1b4