diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 08:02:54 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 08:02:54 (GMT) |
| commit | 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (patch) | |
| tree | c5aa57e70d901ae05b25e61387a351e6b0b2826b /drivers/input/serio/Makefile | |
| parent | 037db524a2015607031c70a7935153120601b908 (diff) | |
| parent | 0a0d62857366d8a6531e7fed1c3ccdd9a2b5b40b (diff) | |
| download | linux-fsl-qoriq-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.tar.xz | |
Merge branch 'for-linus' into next
Bring in changes to ads7846 to avoid mereg conflicts.
Diffstat (limited to 'drivers/input/serio/Makefile')
0 files changed, 0 insertions, 0 deletions