Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Mar 2010 15:51:36 +0000 (07:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Mar 2010 15:51:36 +0000 (07:51 -0800)
commita2e28fc1164e56d37a56e3c53bd3e5a64462fd02
tree144dfddbd6d619db549bf43e43ddc116f29e9774
parent03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b
parenta3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb
Merge git://git./linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
  pcmcia: CodingStyle fixes
  pcmcia: alchemy: fixup wrong comments
  pcmcia: remove irq_list parameter from pd6729
  yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
Documentation/feature-removal-schedule.txt