From: Martin Schwidefsky Date: Tue, 9 Oct 2012 12:18:10 +0000 (+0200) Subject: Merge tag 'disintegrate-s390-20121009' of X-Git-Tag: v3.7-rc1~62^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab08ff34b44f752b664ebb312d2e110cf37a7f5e;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 --- ab08ff34b44f752b664ebb312d2e110cf37a7f5e diff --cc arch/s390/include/asm/chpid.h index 8af0b92,64c76dd..38c405e --- a/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 */ - #ifndef _ASM_S390_CHPID_H #define _ASM_S390_CHPID_H