]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b7cb00 f09bbaf)
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)
commit2ef5f1abe0e22ac5f887f29c2ac911049bda7195
tree80579bb79480ac303cad99c359549d4e86bcc773tree | snapshot
parent5b7cb0012028a3960bdce830dc4422b1287ab317commit | diff
parentf09bbafae9a88de1fa9bb315a76239e4df670d18commit | 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.