diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 10:58:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 10:58:36 -0400 |
| commit | 3fb938b2a8bdbcf6086192d90fb7c73425e41fb9 (patch) | |
| tree | 3b273692ee6a34c603f83a645b29573c404ffc97 /net/sctp/socket.c | |
| parent | 970b06485ffee36aa3549dfe4c6b2a2c2118354d (diff) | |
| parent | 83bf6f11e82eba8533f8dbd241b2c2825e42ae5d (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: fix matching rules for pseudo-multi-function cards
pcmcia: pcmcia_dev_present bugfix
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions