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-08-25 12:28:33 +02:00
2008-08-31 01:23:17 -07:00
2008-10-13 09:51:42 -07:00
2008-08-20 15:40:31 -07:00
2008-07-25 10:53:43 -07:00
2008-10-13 14:12:40 -07:00
2008-07-25 10:53:43 -07:00
2008-10-11 09:05:20 +11:00
2008-08-23 12:14:12 -07:00
2008-10-13 09:51:44 -07:00
2008-07-16 23:27:02 +02:00
2008-10-13 09:51:44 -07:00
2008-04-25 08:04:56 +08:00
2008-06-20 14:05:55 -06:00
2008-07-15 12:24:55 +10:00
2008-04-30 08:29:52 -07:00
2008-06-20 14:05:53 -06:00
2008-10-13 09:51:38 -07:00
2008-03-03 14:53:16 -08:00
2008-06-20 14:05:56 -06:00
2008-07-25 10:53:43 -07:00
2008-08-07 09:55:48 +01:00
2008-07-26 13:22:56 -07:00
2008-06-20 14:05:53 -06:00
2008-08-04 16:59:56 -07:00
2008-10-13 09:51:38 -07:00
2008-07-20 17:12:36 -07:00
2008-07-22 13:03:28 -07:00
2008-06-12 18:05:41 -07:00
2008-10-13 09:51:44 -07:00
2008-06-20 14:05:57 -06:00
2008-10-10 09:25:43 +02:00
2008-04-17 07:46:10 +10:00
2008-10-13 09:51:37 -07:00
2008-08-04 12:02:00 +10:00
2008-07-25 12:06:06 +10:00
2008-07-25 12:06:06 +10:00
2008-02-14 22:11:02 +11:00
2008-07-25 12:06:06 +10:00
2008-08-20 12:40:07 +02:00
2008-08-04 12:02:00 +10:00
2008-04-30 08:29:54 -07:00
2008-05-01 08:04:00 -07:00
2008-06-20 14:05:57 -06:00
2008-10-13 09:51:41 -07:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:41 -07:00
2008-07-21 00:55:14 -04:00
2008-07-21 21:54:41 -07:00
2008-10-13 09:51:40 -07:00
2008-06-20 14:05:48 -06:00
2008-02-07 08:42:25 -08:00
2008-07-24 10:47:15 -07:00
2008-07-21 21:54:41 -07:00
2008-07-17 11:34:49 -07:00
2008-10-13 09:51:41 -07:00
2008-04-30 08:29:43 -07:00
2008-07-24 10:47:14 -07:00
2008-10-13 09:51:44 -07:00
2008-04-30 08:29:49 -07:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:45 -07:00
2008-10-13 09:51:39 -07:00
2008-07-23 09:36:23 -07:00
2008-07-26 16:29:24 +01:00
2008-06-20 14:05:53 -06:00
2008-07-25 10:53:43 -07:00
2008-10-13 09:51:44 -07:00
2008-10-09 08:56:05 +02:00
2008-07-21 21:54:41 -07:00
2008-07-22 13:03:28 -07:00
2008-07-20 17:12:38 -07:00
2008-07-20 17:12:38 -07:00
2008-07-22 13:03:28 -07:00
2008-07-20 17:12:38 -07:00
2008-08-30 00:23:51 -07:00
2008-06-20 14:05:53 -06:00
2008-07-20 17:12:34 -07:00
2008-07-26 20:29:03 -07:00
2008-05-05 12:37:02 -07:00
2008-05-16 12:01:45 -07:00
2008-07-21 21:54:41 -07:00
2008-04-18 22:22:54 -04:00
2008-07-02 15:06:25 -06:00
2008-07-20 17:12:38 -07:00
2008-07-22 13:03:28 -07:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:39 -07:00
2008-02-07 08:42:33 -08:00
2008-08-16 17:21:58 -07:00
2008-08-07 04:05:46 -04:00
2008-08-07 04:05:46 -04:00
2008-06-27 11:52:45 +02:00
2008-06-20 14:05:53 -06:00
2008-06-20 14:05:51 -06:00
2008-04-30 23:15:34 +02:00
2008-10-13 09:51:39 -07:00
2008-10-13 09:51:40 -07:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:44 -07:00
2008-08-01 12:50:15 -07:00
2008-10-13 09:51:41 -07:00
2008-07-21 21:54:41 -07:00
2008-07-21 21:54:41 -07:00
2008-07-25 12:06:06 +10:00
2008-07-26 20:29:03 -07:00
2008-06-20 14:05:53 -06:00
2008-10-13 09:51:40 -07:00
2008-10-13 09:51:42 -07:00