Merge git://git.infradead.org/hdrcleanup-2.6
commitcee4cca740d209bcb4b9857baa2253d5ba4e3fbe
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 22:10:08 +0000 (20 15:10 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 22:10:08 +0000 (20 15:10 -0700)
tree88a23004393ea4a32cad79839479c8e653e401d6
parent2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6
parent9348f0de2d2b541b4ba64fb1f4efee9710a3d731
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
51 files changed:
include/asm-alpha/smp.h
include/asm-arm/arch-lh7a40x/constants.h
include/asm-arm/arch-lh7a40x/irqs.h
include/asm-arm/arch-lh7a40x/registers.h
include/asm-arm/arch-s3c2410/uncompress.h
include/asm-arm/system.h
include/asm-mips/addrspace.h
include/asm-mips/ddb5xxx/ddb5xxx.h
include/asm-mips/delay.h
include/asm-mips/fpu.h
include/asm-mips/futex.h
include/asm-mips/mach-ip32/cpu-feature-overrides.h
include/asm-mips/mach-mips/cpu-feature-overrides.h
include/asm-mips/mach-sim/cpu-feature-overrides.h
include/asm-mips/mipsregs.h
include/asm-mips/mmzone.h
include/asm-mips/page.h
include/asm-mips/pgtable-32.h
include/asm-mips/pgtable-64.h
include/asm-mips/pgtable.h
include/asm-mips/processor.h
include/asm-mips/smp.h
include/asm-mips/sn/addrs.h
include/asm-mips/sn/klconfig.h
include/asm-mips/sn/kldir.h
include/asm-mips/sn/sn0/addrs.h
include/asm-mips/sn/sn0/arch.h
include/asm-mips/sn/sn0/hubmd.h
include/asm-mips/war.h
include/asm-s390/lowcore.h
include/asm-sparc64/pgtable.h
include/linux/input.h
include/linux/mempolicy.h
include/linux/mmzone.h
include/linux/module.h
include/linux/mtd/mtd.h
include/linux/mtd/nand.h
include/linux/netdevice.h
include/linux/netfilter_ipv4/ip_conntrack.h
include/linux/pci.h
include/linux/skbuff.h
include/linux/tcp.h
include/linux/vt_kern.h
include/mtd/mtd-abi.h
include/net/compat.h
include/net/ip.h
include/net/netfilter/nf_conntrack.h
include/net/raw.h
include/net/sctp/sctp.h
include/net/sock.h
include/net/tcp.h