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

diff --cc arch/s390/include/asm/chpid.h
index 8af0b92,64c76dd..38c405e
--- 1/arch/s390/include/asm/chpid.h
--- 2/arch/s390/include/asm/chpid.h
+++ b/arch/s390/include/asm/chpid.h
@@@ -1,8 -1,7 +1,7 @@@
  /*
 - *    Copyright IBM Corp. 2007
 + *    Copyright IBM Corp. 2007, 2012
   *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
   */
- 
  #ifndef _ASM_S390_CHPID_H
  #define _ASM_S390_CHPID_H
  

diff --cc arch/s390/include/asm/setup.h
Simple merge

diff --cc arch/s390/include/uapi/asm/chsc.h
Simple merge