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