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-09-29 00:27:54 -04:00
2008-05-06 11:43:44 -04:00
2008-09-29 00:29:12 -04:00
2008-10-11 12:39:35 -07:00
2008-07-11 09:42:03 -04:00
2008-09-29 00:27:54 -04:00
2008-10-10 10:52:45 -07:00
2008-07-14 15:59:32 -04:00
2008-10-10 22:39:20 +02:00
2008-09-08 12:15:38 -04:00
2008-10-10 10:52:45 -07:00
2008-05-06 11:33:58 -04:00
2008-08-22 02:27:49 -04:00
2008-07-31 01:38:19 -04:00
2008-05-19 17:30:32 -04:00
2008-04-17 15:44:21 -04:00
2008-08-05 14:36:57 +02:00
2008-08-22 02:27:49 -04:00
2008-09-29 00:28:29 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:22 -04:00
2008-04-17 15:44:21 -04:00
2008-08-22 02:27:49 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-05-19 17:30:32 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-06-04 06:40:41 -04:00
2008-04-17 15:44:21 -04:00
2008-08-22 02:33:23 -04:00
2008-04-17 15:44:21 -04:00
2008-07-27 09:46:18 +01:00
2008-04-17 15:44:21 -04:00
2008-07-14 15:59:33 -04:00
2008-09-08 12:11:36 -04:00
2008-07-12 12:10:52 -06:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:22 -04:00
2008-05-19 17:30:32 -04:00
2008-05-19 17:30:32 -04:00
2008-02-06 06:54:17 -05:00
2008-08-22 02:27:49 -04:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-08-23 02:00:44 +02:00
2008-04-17 15:44:21 -04:00
2008-04-17 15:44:21 -04:00
2008-04-25 00:45:04 -04:00
2008-07-14 15:59:33 -04:00
2008-04-17 15:44:21 -04:00
2008-06-04 06:40:41 -04:00
2008-04-17 15:44:21 -04:00
2008-08-22 02:27:49 -04:00
2008-07-14 15:59:32 -04:00
2008-05-06 11:33:58 -04:00
2008-04-17 15:44:21 -04:00
2008-09-29 00:28:02 -04:00
2008-07-11 09:38:24 -04:00
2008-05-19 17:56:10 -04:00
2008-04-17 15:44:21 -04:00
2008-08-22 02:19:54 -04:00
2008-07-14 15:59:33 -04:00
2008-04-17 15:44:21 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-10-10 07:46:45 -07:00
2008-09-29 00:22:28 -04:00
2008-01-23 05:24:15 -05:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-04-17 15:44:23 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2008-09-29 00:22:28 -04:00
2007-07-02 10:17:42 -04:00