Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-stable/drivers/char/pcmcia
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
..
cm4000_cs.c
[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation
2006-12-04 20:12:02 -05:00
cm4040_cs.c
[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation
2006-12-04 20:12:02 -05:00
cm4040_cs.h
[PATCH] New Omnikey Cardman 4040 driver
2005-11-13 18:14:10 -08:00
Kconfig
[PATCH] New Omnikey Cardman 4000 driver
2005-11-13 18:14:10 -08:00
Makefile
[PATCH] New Omnikey Cardman 4000 driver
2005-11-13 18:14:10 -08:00
synclink_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