Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits) pcmcia: ioctl-internal definitions pcmcia: cistpl header cleanup pcmcia: remove unused argument to pcmcia_parse_tuple() pcmcia: card services header cleanup pcmcia: device_id header cleanup pcmcia: encapsulate ioaddr_t pcmcia: cleanup device driver header file pcmcia: cleanup socket services header file pcmcia: merge ds_internal.h into cs_internal.h pcmcia: cleanup cs_internal.h pcmcia: cs_internal.h is internal pcmcia: use dev_printk for cs_error() pcmcia: remove CS_ error codes alltogether pcmcia: deprecate CS_BAD_TUPLE pcmcia: deprecate CS_BAD_ARGS pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE pcmcia: deprecate CS_NO_MORE_ITEMS pcmcia: deprecate CS_IN_USE pcmcia: deprecate CS_CONFIGURATION_LOCKED ... Fix trivial conflict in drivers/pcmcia/ds.c manually		2008-10-13 14:12:40 -07:00
..
act2000
capi	tty: Fallout from tty-move-canon-specials	2008-10-13 09:51:44 -07:00
divert	isdn: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
gigaset	tty: fix up gigaset a bit	2008-10-13 09:51:44 -07:00
hardware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
hisax	pcmcia: deprecate CS_SUCCESS	2008-08-23 02:29:26 +02:00
hysdn	hysdn: remove the packed attribute from PofTimStamp_tag	2008-07-30 16:48:05 -07:00
i4l	isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation.	2008-09-22 01:15:02 -07:00
icn
isdnloop	drivers/isdn: correct use of ! and &	2008-03-04 16:35:16 -08:00
mISDN	mISDN: misc timerdev fixes	2008-09-22 19:18:15 -07:00
pcbit
sc	drivers/isdn/sc/ioctl.c: add missing kfree	2008-06-12 18:05:41 -07:00
Kconfig	Add mISDN driver	2008-07-27 01:46:33 +02:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00