Jeff Garzik 983f27d37d Merge branch 'upstream-fixes' into upstream ...

Conflicts:

	drivers/s390/net/ctctty.c

2006-05-26 22:01:26 -04:00

..

claw.c

[PATCH] s390: kzalloc() conversion in drivers/s390

2006-03-24 07:33:18 -08:00

claw.h

[PATCH] s390: Remove CVS generated information

2006-02-01 08:53:23 -08:00

ctcdbug.c

[PATCH] s390: Remove CVS generated information

2006-02-01 08:53:23 -08:00

ctcdbug.h

[PATCH] s390: Remove CVS generated information

2006-02-01 08:53:23 -08:00

ctcmain.c

Merge branch 'upstream-fixes' into upstream

2006-05-26 22:01:26 -04:00

ctcmain.h

[PATCH] s390: remove tty support from ctc network device driver [1/2]

2006-04-20 17:27:54 -04:00

cu3088.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

cu3088.h

[PATCH] s390: claw driver wiring

2005-05-15 18:06:16 -04:00

fsm.c

[PATCH] s390: kzalloc() conversion in drivers/s390

2006-03-24 07:33:18 -08:00

fsm.h

[PATCH] s390: Remove CVS generated information

2006-02-01 08:53:23 -08:00

iucv.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

iucv.h

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

Kconfig

[PATCH] s390: cleanup Kconfig

2006-01-06 08:33:53 -08:00

lcs.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

lcs.h

[PATCH] s390: lcs driver bug fixes and improvements [2/2]

2006-05-26 21:57:45 -04:00

Makefile

[PATCH] s390: remove tty support from ctc network device driver [1/2]

2006-04-20 17:27:54 -04:00

netiucv.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_eddp.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_eddp.h

[PATCH] s390: Remove CVS generated information

2006-02-01 08:53:23 -08:00

qeth_fs.h

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_main.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_mpc.c

[PATCH] s390: Remove CVS generated information

2006-02-01 08:53:23 -08:00

qeth_mpc.h

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_proc.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_sys.c

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth_tso.h

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

qeth.h

[netdrvr s/390] trim trailing whitespace

2006-05-26 21:58:38 -04:00

smsgiucv.c

[PATCH] s390: iucv message limit for smsg

2006-03-08 14:14:01 -08:00

smsgiucv.h

[PATCH] s390: cmm guest sender id

2005-05-01 08:58:58 -07:00