Merge branch 'fix/oxygen' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:55:30 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:55:30 +0000 (14:55 -0700)
commitb71b7dc09abaeb4417c37b96a898096286b65e3c
tree548585e8e26281f9602d61e04bf4d2c1f4078b5a
parent59430c2f437767094298f30dd02ca038da0df755
parent92653453c3015c083b9fe0ad48261c6b2267d482
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