diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 19:57:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-01 19:57:12 +0100 |
| commit | ab658321f32770b903a4426e2a6fae0392757755 (patch) | |
| tree | c53ceda3114feafe3097cff0061f404884ea19a0 /fs/jfs/jfs_dmap.h | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| parent | Merge branch 'fix/asoc' into for-linus (diff) | |
| download | linux-ab658321f32770b903a4426e2a6fae0392757755.tar.xz linux-ab658321f32770b903a4426e2a6fae0392757755.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:
ASoC: AM3517: ASoC driver not getting compiled
ASoC: AIC23: Fixing writes to non-existing registers in resume function
ALSA: hda - Add an ASUS mobo to MSI blacklist
Diffstat (limited to 'fs/jfs/jfs_dmap.h')
0 files changed, 0 insertions, 0 deletions