]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* 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.


Trivial merge