From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 4 Jan 2007 20:55:56 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.20-rc4~84
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a8057bb38bc803682f3e0af305c258b4566285;p=linux-2.6

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.
---

05a8057bb38bc803682f3e0af305c258b4566285