Google Git
Sign in
kernel / pub / scm / linux / kernel / git / lenb / linux / a6f707b601c3f85d4b816ea08a757ea1af4f1cc0
commita6f707b601c3f85d4b816ea08a757ea1af4f1cc0[log] [tgz]
authorLinus Torvalds <torvalds@linux-foundation.org>Thu Mar 29 16:00:48 2012 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>Thu Mar 29 16:00:48 2012 -0700
tree86cea1675e515c6baca64cea812ebe2ccc6aa955
parentef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5 [diff]
parent80af9e6d7ae633309cc5bca96aee6a45117e7c98 [diff]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

Pull a few PCMCIA updates from Dominik Brodowski.

Fix up trivial conflict (modified code in question had been removed) in
drivers/pcmcia/soc_common.c.

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
  pcmcia at91_cf: fix raw gpio number usage
  ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
  pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
  pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
  pcmcia: irq: Remove IRQF_DISABLED
tree: 86cea1675e515c6baca64cea812ebe2ccc6aa955
  1. arch/
  2. block/
  3. crypto/
  4. Documentation/
  5. drivers/
  6. firmware/
  7. fs/
  8. include/
  9. init/
  10. ipc/
  11. kernel/
  12. lib/
  13. mm/
  14. net/
  15. samples/
  16. scripts/
  17. security/
  18. sound/
  19. tools/
  20. usr/
  21. virt/
  22. .gitignore
  23. .mailmap
  24. COPYING
  25. CREDITS
  26. Kbuild
  27. Kconfig
  28. MAINTAINERS
  29. Makefile
  30. README
  31. REPORTING-BUGS