]> git.proxmox.com Git - mirror_ubuntu-kernels.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>
Wed, 7 Jul 2010 00:14:53 +0000 (17:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jul 2010 00:14:53 +0000 (17:14 -0700)
commit8b8ce8810b092cef35e15af6577ad569f6145c0a
tree4fe8af65c11578edb6b4ef9a9ef84aa4061dd2f6
parent7491eb9b5f39dbd9faa32a07d76597ab502166a1
parente4f1ac2122413736bf2791d3af6533f36b46fc61
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: do not initialize the present flag too late.