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

..

3c574_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

3c589_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

axnet_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

com20020_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

fmvj18x_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

ibmtr_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

Kconfig

…

Makefile

…

nmclan_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

ositech.h

…

pcnet_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

smc91c92_cs.c

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-04 20:12:02 -05:00

xirc2ps_cs.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-06 15:01:18 +00:00