diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-02 17:48:32 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-02 17:48:32 +0200 |
commit | cfbc78003e2b12e60a1d594ce192c30aea44eb2a (patch) | |
tree | 03c650f0f144f81b21a93b5278daa36dc2cc6c50 /drivers/char/nvram.c | |
parent | dc8a4f3fc3c32954c9fd46cb027b959380be2d65 (diff) | |
parent | 3f5d3465be8f6e04f43d9b6d543fe28d4be07d78 (diff) |
Merge branch 'fix/caiaq' into for-linus
* fix/caiaq:
ALSA: usx2y - reparent sound device
ALSA: snd_usb_caiaq: reparent sound device
Diffstat (limited to 'drivers/char/nvram.c')
0 files changed, 0 insertions, 0 deletions