diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-01 02:47:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-01 02:47:09 +0100 |
| commit | c4319c7db8c3805e4811eaceeee6c2fa51411bd4 (patch) | |
| tree | d47c9a0e422695fba3120af9fa3310e811bba723 /drivers/block/floppy.c | |
| parent | mm: <asm-generic/pgtable.h> must include <linux/mm_types.h> (diff) | |
| parent | Merge branch 'fix/asoc' into for-linus (diff) | |
| download | linux-c4319c7db8c3805e4811eaceeee6c2fa51411bd4.tar.xz linux-c4319c7db8c3805e4811eaceeee6c2fa51411bd4.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:
eukrea-tlv320: fix platform_name
ASoC: correct pxa AC97 DAI names
ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs
ALSA: HDA: Add ideapad quirk for two Dell machines
ALSA: HDA: Add a new Conexant codec 506e (20590)
ALSA: usb-audio: fix oops due to cleanup race when disconnecting
ASoC: Hook wm_hubs micbiases up to CLK_SYS
ASoC: Correct definition of WM8903_VMID_RES_5K
ASoC: Fix WM8958 default microphone detection argument ordering
ALSA: HDA: Fix mic initialization in VIA auto parser
ALSA: fix one memory leak in sound jack
Diffstat (limited to 'drivers/block/floppy.c')
0 files changed, 0 insertions, 0 deletions