tree 38c67c8739724bc398866d068336c8034f82526f
parent 8be7ed14f4f45e0cd19a70120a1526e1121af4b0
parent f9af1d9deaaffe6803dec693748498886915d766
author Linus Torvalds <torvalds@woody.osdl.org> 1167944156 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1167944156 -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:
  [SOUND] Sparc CS4231: Use 64 for period_bytes_min
  [SOUND] Sparc CS4231: Fix IRQ return value and initialization.