tree 4fa80b5ebbb92fe46a836e68c0e4d38f0885e7a6
parent fec468b0c9e0a75b89514408e3b35b1576b57071
parent 2b0dd802ba1ff9b7001f5f9bd9b4d192a4aabf81
author Linus Torvalds <torvalds@g5.osdl.org> 1149535828 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149535828 -0700

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