Martin Schwidefsky ab08ff34b4 Merge tag 'disintegrate-s390-20121009' of ...

git://git.infradead.org/users/dhowells/linux-headers

Pull UAPI patchset from David Howells:
 "Can you merge the following branch into the s390 tree please.
  This is to complete part of the UAPI disintegration for which the
  preparatory patches were pulled recently."

Conflicts:
	arch/s390/include/asm/chpid.h

2012-10-09 14:18:10 +02:00

..

auxvec.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

bitsperlong.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

byteorder.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

chpid.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

chsc.h

Merge tag 'disintegrate-s390-20121009' of

2012-10-09 14:18:10 +02:00

cmb.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

dasd.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

debug.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

errno.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

fcntl.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

ioctl.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

ioctls.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

ipcbuf.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

Kbuild

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

kvm_para.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

kvm_virtio.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

kvm.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

mman.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

monwriter.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

msgbuf.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

param.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

poll.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

posix_types.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

ptrace.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

qeth.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

resource.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

schid.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

sembuf.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

setup.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

shmbuf.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

sigcontext.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

siginfo.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

signal.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

socket.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

sockios.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

stat.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

statfs.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

swab.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

tape390.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

termbits.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

termios.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

types.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

ucontext.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

unistd.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

vtoc.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00

zcrypt.h

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09 09:47:31 +01:00