diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:40:51 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:40:51 -0700 |
| commit | 7774036808011ceecc88cef01dfafcce39ed9fc5 (patch) | |
| tree | e88670cf3fba9d885b3d71c00fb9a7809ed3f9e2 /Documentation/blockdev/floppy.txt | |
| parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
| parent | 51c80b74002f86477d691ed7c8ac479dcfa6271c (diff) | |
| download | talos-op-linux-7774036808011ceecc88cef01dfafcce39ed9fc5.tar.gz talos-op-linux-7774036808011ceecc88cef01dfafcce39ed9fc5.zip | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Merge Henrik's updates to multitouch code. Even though Jiri already
pulled them in I need to do it too since my changes to evdev using
dynamic major would clash with them.
Diffstat (limited to 'Documentation/blockdev/floppy.txt')
0 files changed, 0 insertions, 0 deletions
