diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-14 14:39:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-14 14:39:47 +1000 |
| commit | 2b244c0fb87051a9d9a90655c4de3b8c7f7a68ac (patch) | |
| tree | 32da5dcd6c7411a0b8aab4649802f33f3245ffdc /drivers/input/misc/powermate.c | |
| parent | 58fe75f1a0ee3e7f869c70aae3ce4ee6c433dded (diff) | |
| parent | 9341c3f14b67e2a9430afc5fdddffcea85092c48 (diff) | |
Merge branch 'quilt/tty'
Conflicts:
include/linux/tty.h
Diffstat (limited to 'drivers/input/misc/powermate.c')
0 files changed, 0 insertions, 0 deletions