diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-29 22:34:47 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-29 22:34:47 -0700 |
| commit | cf45b5a2525d9e7473db955750a8db9d4160b6ab (patch) | |
| tree | fa0d5db50adfbf4906313567c9f8f72984fadb0e /drivers/input/serio/i8042-io.h | |
| parent | 314820c9e892d8f41ba4db300ec96770d9c8294b (diff) | |
| parent | c0394506e69b37c47d391c2a7bbea3ea236d8ec8 (diff) | |
Merge branch 'next' into for-linus
Prepare second set of changes for 3.6 merge window.
Diffstat (limited to 'drivers/input/serio/i8042-io.h')
0 files changed, 0 insertions, 0 deletions