diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 20:17:48 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 20:17:48 +0300 |
| commit | 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb (patch) | |
| tree | c076d2f0b5d4ae8726a50206042d3e3a41620fe4 /Documentation/DocBook/alsa-driver-api.tmpl | |
| parent | 56a8bd6dcf81693e61a712097216904f3a4ab536 (diff) | |
| parent | 69479f8da68f1930b2078b2ebf6533fb00339918 (diff) | |
| download | linux-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Conflicts:
drivers/input/Makefile
Diffstat (limited to 'Documentation/DocBook/alsa-driver-api.tmpl')
0 files changed, 0 insertions, 0 deletions