diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 20:40:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-12 20:40:50 +0100 |
| commit | 6eb7365db6f3a4a9d8d9922bb0b800f9cbaad641 (patch) | |
| tree | 02eb4f5aa46cefae0cbfe195b9578b87f3db96a1 /drivers/watchdog/Makefile | |
| parent | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge branch 'topic/hda' into for-linus (diff) | |
| download | linux-6eb7365db6f3a4a9d8d9922bb0b800f9cbaad641.tar.xz linux-6eb7365db6f3a4a9d8d9922bb0b800f9cbaad641.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Overwrite pin config on intel DG45ID board.
intelhdmi - dont power off HDA link
ALSA: hrtimer - Fix lock-up
ALSA: intelhdmi - add channel mapping for typical configurations
ALSA: intelhdmi - channel mapping applies to Pin
ALSA: intelhdmi - accept DisplayPort pin
ALSA: hda - show HBR(High Bit Rate) pin cap in procfs
ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs
ASoC: Fix build of OMAP sound drivers
ALSA: opti93x: fix irq releasing if the irq cannot be allocated
Diffstat (limited to 'drivers/watchdog/Makefile')
0 files changed, 0 insertions, 0 deletions