tree 6d0e5f6665e5c89ee392379967a52e6fcae17cf2
parent 89697f1d715e20fff0361cca79efd5a371623af7
parent 34cc560e6a72ff414ff7d107426a411b0a093ad3
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171323330 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171323330 -0800

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.