diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-10 09:48:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-10 09:48:27 -0700 |
| commit | 94b849aaf6e22ab7bf54b0d0377a882d4892396d (patch) | |
| tree | 6209e43f722c73fe44d7053554386028fd25e23d /drivers/watchdog/omap_wdt.h | |
| parent | f7422464b57088071201cd94027662d8469f153b (diff) | |
| parent | 482c45331519524e4aeaf8a9084a445500822b85 (diff) | |
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard"
ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec
ALSA: hda - fix DG45ID SPDIF output
Diffstat (limited to 'drivers/watchdog/omap_wdt.h')
0 files changed, 0 insertions, 0 deletions