diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 20:52:53 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 20:52:53 +0100 |
commit | c732acd96085347027b11961463a243c568d9aab (patch) | |
tree | 5ce568eb6a31a39dfa5c5af4e10e6270383a07a2 /drivers/video/w100fb.c | |
parent | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
parent | fdomain_cs: Sort out modules with duplicate description (diff) | |
download | linux-c732acd96085347027b11961463a243c568d9aab.tar.xz linux-c732acd96085347027b11961463a243c568d9aab.zip |
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:
fdomain_cs: Sort out modules with duplicate description
pcmcia: Whine harder about use of EXCLUSIVE
pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted
Diffstat (limited to 'drivers/video/w100fb.c')
0 files changed, 0 insertions, 0 deletions