Linus Torvalds cee4cca740 Merge git://git.infradead.org/hdrcleanup-2.6 ... * git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h		2006-06-20 15:10:08 -07:00
..
iscsi_if.h
iscsi_proto.h
scsi_cmnd.h	[SCSI] Neaten comments in scsi_cmnd.h	2006-02-27 22:55:02 -06:00
scsi_dbg.h
scsi_device.h	[SCSI] add scsi_mode_select to scsi_lib.c	2006-03-19 10:19:14 -06:00
scsi_devinfo.h	[SCSI] add SCSI_UNKNOWN and LUN transfer limit restrictions	2006-04-13 10:13:31 -05:00
scsi_driver.h
scsi_eh.h
scsi_host.h	[PATCH] move ->eh_strategy_handler to the transport class	2006-04-10 14:15:47 -04:00
scsi_ioctl.h	[SCSI] unify SCSI_IOCTL_SEND_COMMAND implementations	2006-04-13 10:13:15 -05:00
scsi_request.h
scsi_tcq.h
scsi_transport_fc.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
scsi_transport_iscsi.h
scsi_transport_sas.h	[SCSI] eliminate rphy allocation in favour of expander/end device allocation	2006-03-19 10:21:16 -06:00
scsi_transport_spi.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
scsi_transport.h	[PATCH] move ->eh_strategy_handler to the transport class	2006-04-10 14:15:47 -04:00
scsi.h	[SCSI] fix scsi process problems and clean up the target reap issues	2006-02-27 23:37:45 -06:00
scsicam.h
sg_request.h
sg.h
srp.h	[SCSI] srp.h: Add I/O Class values	2006-06-17 20:37:38 -07:00