tree 143e2f6de71cd0cb5ac74e423d87fb950df7bf2f
parent 103a1d5c57fac3623613b130b104f5b03367b31c
parent 0e09c863dbb8b1816ebc106df1a1cae4c588ce0e
author Linus Torvalds <torvalds@linux-foundation.org> 1217895261 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217895261 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  pcmcia: rsrc_nonstatic: check value, not pointer