diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 18:17:48 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-16 18:17:48 +0100 |
| commit | 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb (patch) | |
| tree | c076d2f0b5d4ae8726a50206042d3e3a41620fe4 /arch/um/drivers/stderr_console.c | |
| parent | Input: add ST1232 touchscreen controller driver (diff) | |
| parent | Input: include MT library as source for kerneldoc (diff) | |
| download | linux-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.tar.xz linux-67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb.zip | |
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 'arch/um/drivers/stderr_console.c')
0 files changed, 0 insertions, 0 deletions