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
..
2008-07-21 15:16:44 -07:00
2008-07-21 15:15:46 -07:00
2008-07-21 15:16:45 -07:00
2007-05-23 20:14:15 -07:00
2008-09-23 13:58:06 -07:00
2008-05-29 13:59:04 -07:00
2008-10-10 13:41:45 +02:00
2007-08-20 23:38:44 -07:00
2008-08-09 13:44:58 +02:00
2008-05-29 13:59:03 -07:00
2008-05-29 13:59:03 -07:00
2008-05-29 13:59:03 -07:00
2008-07-21 15:15:46 -07:00
2008-08-07 09:49:42 -04:00
2008-09-23 13:58:08 -07:00
2008-07-26 16:17:01 +02:00
2008-07-25 10:53:29 -07:00
2008-07-25 10:53:29 -07:00
2008-08-21 10:26:32 -07:00
2008-08-13 17:32:55 -07:00
2008-07-21 15:16:33 -07:00
2008-06-09 16:04:12 +09:00
2008-05-02 10:25:50 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-07-21 15:15:46 -07:00
2008-08-21 10:26:38 -07:00
2008-08-13 17:32:58 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2007-10-12 14:54:59 -07:00
2008-09-04 09:45:47 +01:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-10-07 19:12:58 +01:00
2008-08-13 17:32:58 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-21 10:26:38 -07:00
2008-08-13 17:32:58 -07:00
2008-04-24 21:16:55 -07:00
2008-08-13 17:32:56 -07:00
2008-04-24 21:16:49 -07:00
2008-08-29 09:43:14 +02:00
2008-07-25 10:53:29 -07:00
2008-07-25 10:53:29 -07:00
2008-08-21 10:26:38 -07:00
2007-10-12 14:55:19 -07:00
2008-05-02 10:25:57 -07:00
2008-05-02 10:25:57 -07:00
2008-07-21 15:16:30 -07:00
2008-04-24 21:16:55 -07:00