aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 12:30:28 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 12:30:28 -0700
commit364212e0df05efee43d87270b476fc5c9ad2c651 (patch)
tree4fa80b5ebbb92fe46a836e68c0e4d38f0885e7a6 /net
parentfec468b0c9e0a75b89514408e3b35b1576b57071 (diff)
parent2b0dd802ba1ff9b7001f5f9bd9b4d192a4aabf81 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: [PATCH] pcmcia: fix zeroing of cm4000_cs.c data [PATCH] pcmcia: missing pcmcia_get_socket() result check
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions