David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/firmware/iscsi_ibft.c

2010-02-28 19:23:06 -08:00

..

ciscode.h

pcmcia: cleanup device driver header file

2008-08-29 09:28:47 +02:00

cisreg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cistpl.h

pcmcia: ioctl-internal definitions

2008-08-31 16:00:42 +02:00

cs_types.h

pcmcia: Change window_handle_t logic to unsigned long

2009-11-28 18:02:50 +01:00

cs.h

pcmcia: remove unused IRQ_FIRST_SHARED

2009-12-07 22:23:24 +01:00

device_id.h

Introduce PCMCIA_DEVICE_PROD_ID3

2010-02-19 15:51:23 -05:00

ds.h

pcmcia: use mutex for dynid lock

2010-02-17 17:48:23 +01:00

mem_op.h

pcmcia: CodingStyle fixes

2009-12-07 22:23:40 +01:00

ss.h

pcmcia: use state machine for extended requery

2010-02-17 17:48:27 +01:00