From: Martin Schwidefsky <schwidefsky@de.ibm.com>
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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab08ff34b44f752b664ebb312d2e110cf37a7f5e;p=pandora-kernel.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
Reading git-diff-tree failed