diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:42 -0700 |
| commit | 87156d692afdc4c689e99380a263445217a4b76c (patch) | |
| tree | 918cd55f9338626c2d354cfe8b6a66e451fedf99 /net/sctp/tsnmap.c | |
| parent | e4049eb8527668a6c7f97b944970b81d1316d5b0 (diff) | |
| parent | c61fae964a5ee04c4e4a01caecaf778c2e26e589 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: drivers/serial/pmac_zilog.c: add missing unlock
serial: 8250_pnp - add Fujitsu Wacom device
tty: Fix regressions in the char driver conversion
Diffstat (limited to 'net/sctp/tsnmap.c')
0 files changed, 0 insertions, 0 deletions