Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:14:21 +0000 (17:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:14:21 +0000 (17:14 -0700)
commitc44df7413fd711bca818111b94cbd7ce5f3600a9
tree143e2f6de71cd0cb5ac74e423d87fb950df7bf2f
parent103a1d5c57fac3623613b130b104f5b03367b31c
parent0e09c863dbb8b1816ebc106df1a1cae4c588ce0e
Merge git://git./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