]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 May 2010 21:11:09 +0000 (14:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 May 2010 21:11:09 +0000 (14:11 -0700)
commit5ae1053809a0810ac96f91c24935e5b2d42b2e6a
tree7a97585278a6e5d49f0b969b8047918f4f5239c2
parentc2e6b0ee246b0ea8e046183dd28bb590dee3f745
parent2dcc0d824b1a5d1ace30edec2b19a6c679a98c77
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