git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 450e47d 9807f75)
Merge tag 'disintegrate-s390-20121009' of
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 9 Oct 2012 12:18:10 +0000 (14:18 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 9 Oct 2012 12:18:10 +0000 (14:18 +0200)
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


Trivial merge
Pandora Kernel Repository