| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Thu Jan 06 22:34:59 2011 -0800 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Thu Jan 06 22:34:59 2011 -0800 |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 | |
| parent | 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 [diff] | |
| parent | a6d38f889750ed6290728a19d9dad577b147c6d0 [diff] |
Merge branch 'next' into for-linus Conflicts: include/linux/input.h