davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4796b71fbb
kernel-ark/drivers/isdn/hisax
History
David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-06 15:01:18 +00:00
..
amd7930_fn.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
amd7930_fn.h fix file specification in comments 2006-10-03 23:01:26 +02:00
arcofi.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
arcofi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
asuscom.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
avm_a1.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
avm_a1p.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
avm_pci.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
avma1_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
bkm_a4t.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
bkm_a8.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
bkm_ax.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
callc.c [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
config.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
diva.c [PATCH] drivers/isdn: ioremap balanced with iounmap 2006-10-20 10:26:43 -07:00
elsa_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
elsa_ser.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
elsa.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
enternow_pci.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
fsm.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fsm.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
gazel.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hfc4s8s_l1.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
hfc4s8s_l1.h Fix misc .c/.h comment typos 2006-11-30 05:24:39 +01:00
hfc_2bds0.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
hfc_2bds0.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hfc_2bs0.c [PATCH] hisax: fix usage of __init* 2006-07-10 13:24:15 -07:00
hfc_2bs0.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hfc_pci.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
hfc_pci.h [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
hfc_sx.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
hfc_sx.h [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
hfc_usb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hfc_usb.h USB: Dealias -110 code (more complete) 2006-09-27 11:59:00 -07:00
hfcscard.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hisax_cfg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hisax_debug.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
hisax_fcpcipnp.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hisax_fcpcipnp.h [PATCH] Eliminate __attribute__ ((packed)) warnings for gcc-4.1 2006-01-08 20:14:07 -08:00
hisax_if.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hisax_isac.c BUG_ON() Conversion in drivers/isdn 2006-03-26 18:19:26 +02:00
hisax_isac.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hisax.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hscx_irq.c [PATCH] Unlinline a bunch of other functions 2006-01-14 18:27:06 -08:00
hscx.c [PATCH] kfree cleanup: drivers/isdn 2005-11-07 07:54:02 -08:00
hscx.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
icc.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
icc.h [PATCH] hisax: fix usage of __init* 2006-07-10 13:24:15 -07:00
ipac.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ipacx.c [PATCH] hisax: fix usage of __init* 2006-07-10 13:24:15 -07:00
ipacx.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isac.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
isac.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isar.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
isar.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isdnhdlc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isdnhdlc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isdnl1.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
isdnl1.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isdnl2.c Fix typos in drivers/isdn/hisax/isdnl2.c 2006-11-30 05:33:40 +01:00
isdnl2.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isdnl3.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
isdnl3.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
isurf.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ix1_micro.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
jade_irq.c [PATCH] Unlinline a bunch of other functions 2006-01-14 18:27:06 -08:00
jade.c [PATCH] hisax: fix usage of __init* 2006-07-10 13:24:15 -07:00
jade.h [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
Kconfig [PATCH] fix build error for HISAX_NETJET 2006-11-20 09:42:05 -08:00
l3_1tr6.c [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
l3_1tr6.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
l3dss1.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
l3dss1.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
l3ni1.c [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
l3ni1.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
lmgr.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
mic.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
netjet.c [PATCH] hisax: fix usage of __init* 2006-07-10 13:24:15 -07:00
netjet.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
niccy.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
nj_s.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
nj_u.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
q931.c [PATCH] Fix typo in drivers/isdn/hisax/q931.c 2006-06-26 09:58:23 -07:00
s0box.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
saphir.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sedlbauer_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
sedlbauer.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sportster.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
st5481_b.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
st5481_d.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
st5481_init.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
st5481_usb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
st5481.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
tei.c [PATCH] drivers/isdn/hisax/: possible cleanups 2005-06-25 16:25:07 -07:00
teleint.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
teles0.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
teles3.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
teles_cs.c [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation 2006-12-04 20:12:02 -05:00
telespci.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
w6692.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
w6692.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00