From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 21:55:30 +0000 (-0700)
Subject: Merge branch 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... 
X-Git-Tag: v2.6.31-rc9~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b71b7dc09abaeb4417c37b96a898096286b65e3c

Merge branch 'fix/oxygen' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  sound: oxygen: handle cards with missing EEPROM
  sound: oxygen: fix MCLK rate for 192 kHz playback
---

b71b7dc09abaeb4417c37b96a898096286b65e3c