]> git.hungrycats.org Git - linux/commitdiff
Merge uidc2-166.inav.uiowa.net:kernel/v2.5/linux-2.5.isdn
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Sat, 11 Jan 2003 04:36:01 +0000 (22:36 -0600)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Sat, 11 Jan 2003 04:36:01 +0000 (22:36 -0600)
into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn

1  2 
drivers/isdn/hisax/avm_pci.c
drivers/isdn/hisax/config.c
drivers/isdn/hisax/w6692.c

Simple merge
Simple merge
Simple merge