tree b8ecab3d969eb3e56155f9ce2e323e73f63134f9
parent a7b334de4d3651491ccd8c52c744af88d48785b9
parent 018ef96969098487ea3fdabd904d775a4cd93975
author Linus Torvalds <torvalds@linux-foundation.org> 1239237819 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239237819 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Hook up sys_preadv and sys_pwritev
  sparc64: add_node_ranges() must be __init
  serial: sunsu: sunsu_kbd_ms_init needs to be __devinit
  sparc: Fix section mismatch warnings in cs4231 sound driver.
  sparc64: Fix section mismatch warnings in PCI controller drivers.
  sparc64: Fix section mismatch warnings in power driver.
  sparc64: get_cells() can't be marked __init