]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 789edd7 70bde82)
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)
commit2fb3ff611ca786c6c7e77d83eb0255432cb2d38b
tree80579bb79480ac303cad99c359549d4e86bcc773tree | snapshot
parent789edd7e0310712e117b0cc37d0cff96e6480a8fcommit | diff
parent70bde82e98328c7158ca0d060f4b49fecf4c0bf0commit | 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
Linux Kernel Source Tree.