diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-05-01 16:24:37 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-01 16:24:37 +0100 |
commit | 2683e88413977a7f382106f8e8b3b684a597c761 (patch) | |
tree | 96f56121c3afed843fb705cbc75aa85cf9038fd0 /include/sound/control.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
download | linux-dev-2683e88413977a7f382106f8e8b3b684a597c761.tar.xz linux-dev-2683e88413977a7f382106f8e8b3b684a597c761.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but
more intrusive) fix is now merged upstream.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/sound/control.h')
0 files changed, 0 insertions, 0 deletions