projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitab08ff34b44f752b664ebb312d2e110cf37a7f5e
tree80579bb79480ac303cad99c359549d4e86bcc773tree | snapshot
parent450e47da67499aeb6f1700e8f84747460c11ab56commit | diff
parent9807f75955ea7f1877981056755284481873115ccommit | diff
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
arch/s390/include/asm/chpid.h diff1 | diff2 | blob | history
arch/s390/include/asm/setup.h diff1 | diff2 | blob | history
arch/s390/include/uapi/asm/chsc.h | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.