| commit | a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 04 07:51:36 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 04 07:51:36 2010 -0800 |
| tree | 144dfddbd6d619db549bf43e43ddc116f29e9774 | |
| parent | 03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b [diff] | |
| parent | a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb [diff] |
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