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-13 09:51:42 -07:00
2008-07-25 10:53:43 -07:00
2008-10-13 09:51:44 -07:00
2008-06-20 14:05:55 -06:00
2008-10-13 09:51:38 -07:00
2008-06-20 14:05:56 -06:00
2008-07-26 13:22: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-20 14:05:57 -06:00
2008-08-20 12:40:07 +02: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-10-13 09:51:40 -07:00
2008-06-20 14:05:48 -06:00
2008-02-07 08:42:25 -08: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-10-13 09:51:44 -07:00
2008-10-13 09:51:39 -07:00
2008-10-13 09:51:44 -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-07-20 17:12:34 -07:00
2008-07-26 20:29:03 -07:00
2008-07-02 15:06:25 -06:00
2008-07-20 17:12:38 -07:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:39 -07:00
2008-06-20 14:05:51 -06:00
2008-04-30 23:15:34 +02:00
2008-10-13 09:51:44 -07:00
2008-10-13 09:51:41 -07:00
2008-07-26 20:29:03 -07:00