| commit | 15439dd37f92f930ac7fc65a4f261834e4215bb0 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Tue Jun 17 12:02:44 2008 -0400 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Tue Jun 17 12:02:44 2008 -0400 |
| tree | ec8e4a7cffd1cbb55ae4970c3172fa9a6fb0c0f7 | |
| parent | 39ab9ddeb3e9573a1ea9a17a1431ea5c81681964 [diff] | |
| parent | 90d95ef617a535a8832bdcb8dee07bf591e5dd82 [diff] |
Merge branch 'for-linus' into next Conflicts: drivers/input/mouse/appletouch.c