1
0
Files
linux/drivers/net
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-09-03 10:24:09 -04:00
2008-10-12 21:15: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-09-09 05:07:25 -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-10-08 17:09:54 -07:00
2008-09-16 19:35:05 -07:00
2008-08-27 05:36:57 -04:00
2008-10-12 21:08:58 -07:00
2008-10-08 19:51:33 -07:00
2008-10-08 17:09:54 -07:00
2008-10-12 20:59:48 -07:00
2008-08-29 02:13:33 -07: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