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-06 18:14:57 -04:00
2008-10-10 12:26:24 -07:00
2008-10-13 14:12:40 -07:00
2008-10-06 18:14:57 -04:00
2008-08-31 15:50:33 +02:00
2008-10-06 18:14:58 -04:00
2008-10-13 14:12:40 -07:00
2008-09-15 16:48:23 -04:00
2008-10-06 18:14:56 -04:00
2008-08-22 16:29:56 -04:00
2008-10-06 18:14:57 -04:00
2008-10-01 06:12:56 -07:00
2008-09-15 16:48:23 -04:00
2008-05-21 21:48:11 -04:00
2008-10-13 14:12:40 -07:00
2008-09-24 16:17:58 -04:00
2008-08-22 19:28:05 -04:00
2008-10-13 14:12:40 -07:00
2008-09-24 16:17:58 -04:00
2008-08-22 19:28:05 -04:00
2008-08-22 19:28:05 -04:00
2008-08-22 19:28:06 -04:00
2008-08-22 19:28:04 -04:00
2008-08-22 19:28:07 -04:00
2008-08-22 16:29:56 -04:00
2008-08-18 11:05:15 -04:00
2008-08-22 16:29:56 -04:00
2008-08-22 19:28:07 -04:00
2008-09-15 16:48:25 -04:00
2008-08-22 19:28:04 -04:00
2008-10-13 14:12:40 -07:00
2008-10-13 14:12:40 -07:00
2008-08-22 19:28:05 -04:00
2008-08-22 19:28:05 -04:00
2008-08-22 19:28:05 -04:00
2008-08-22 19:28:05 -04:00
2008-09-24 16:17:58 -04:00
2008-08-22 19:28:07 -04:00
2008-10-13 14:12:40 -07:00
2008-09-24 16:17:58 -04:00
2008-08-22 16:29:48 -04:00
2008-10-06 18:14:57 -04:00
2008-05-28 16:43:40 -04:00
2008-05-28 16:43:39 -04:00
2008-05-28 16:43:38 -04:00
2008-08-22 16:29:48 -04:00
2008-09-15 16:48:23 -04:00
2008-07-14 14:52:56 -04:00
2008-07-14 14:52:56 -04:00
2008-08-22 16:29:48 -04:00
2008-10-13 14:12:40 -07:00
2008-07-20 17:12:38 -07:00
2008-10-13 14:12:40 -07:00
2008-08-07 02:23:19 -04:00
2008-10-13 14:12:40 -07:00
2008-07-18 02:39:39 -07:00