diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-11 03:45:21 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-11 03:45:21 -0400 |
| commit | 0cc8d6a9d23d6662da91eeb6bb8e7d1c559850f0 (patch) | |
| tree | 7187a6807ff5bd6e8f8dac7c53e2de28759a8354 /drivers/input/keyboard/hpps2atkbd.h | |
| parent | dde3ada3d0069855eeb353707b2b0f946191cfd6 (diff) | |
| parent | 7f8d4cad1e4e11a45d02bd6e024cc2812963c38a (diff) | |
Merge branch 'next' into for-linus
Prepare second set of updates for 3.7 merge window (Wacom driver update
and patches extending number of input minors).
Diffstat (limited to 'drivers/input/keyboard/hpps2atkbd.h')
0 files changed, 0 insertions, 0 deletions