Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 4 Jan 2007 20:55:56 +0000 (12:55 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 4 Jan 2007 20:55:56 +0000 (12:55 -0800)
commit05a8057bb38bc803682f3e0af305c258b4566285
tree38c67c8739724bc398866d068336c8034f82526f
parent8be7ed14f4f45e0cd19a70120a1526e1121af4b0
parentf9af1d9deaaffe6803dec693748498886915d766
Merge /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.