tree 7a97585278a6e5d49f0b969b8047918f4f5239c2
parent 48fe37cb53a40e13c2f9fc974f574e38d18be303
parent 15d0a873549ef0bdeaa04dacf29a3e15de886d03
author Linus Torvalds <torvalds@linux-foundation.org> 1273266669 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273266669 -0700

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 compilation after 16bit state locking changes
  pcmcia: order userspace suspend and resume requests
  pcmcia: avoid pccard_validate_cis failure in resume callpath