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