]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit79e64d7b52b1034f32f8d16a30af72d72bc5d0ec
tree144dfddbd6d619db549bf43e43ddc116f29e9774
parent00a95501b442b920372f3271774f1af119fa95a8
parent30183a8f4d4eed523dba347750ccd96c241797a7
Merge git://git.kernel.org/pub/scm/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