summaryrefslogtreecommitdiffstats
path: root/drivers/s390
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2014-04-021-17/+306
|\
| * Merge tag 'kvm-s390-20140306' of git://git.kernel.org/pub/scm/linux/kernel/gi...Paolo Bonzini2014-03-061-3/+13
| |\
| | * virtio_ccw: fix hang in set offline processingHeinz Graalfs2014-03-061-3/+13
| * | Merge tag 'kvm-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/m...Paolo Bonzini2014-03-043-35/+21
| |\ \ | | |/ | |/|
| * | virtio-ccw: virtio-ccw adapter interrupt support.Cornelia Huck2014-03-041-10/+268
| * | s390/airq: add support for irq rangesMartin Schwidefsky2014-03-041-25/+41
| * | virtio_ccw: fix vcdev pointer handling issuesHeinz Graalfs2014-03-041-7/+28
* | | Merge tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-04-012-17/+23
|\ \ \
| * \ \ Merge 3.14-rc5 into driver-core-nextGreg Kroah-Hartman2014-03-022-1/+24
| |\ \ \
| * \ \ \ Merge 3.14-rc3 into driver-core-nextGreg Kroah-Hartman2014-02-183-35/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | s390: use device_remove_file_self() instead of device_schedule_callback()Tejun Heo2014-02-072-17/+23
| | |_|/ | |/| |
* | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-04-011-4/+2
|\ \ \ \
| * \ \ \ Merge branch 'irq/for-gpio' into irq/coreThomas Gleixner2014-03-125-3/+33
| |\ \ \ \
| * | | | | s390: Do not rely on magic indirect includesThomas Gleixner2014-03-041-0/+1
| * | | | | s390: Cio: Use the core irq stats functionThomas Gleixner2014-03-041-4/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2014-04-011-1/+1
|\ \ \ \ \
| * | | | | cputime: Default implementation of nsecs -> cputime conversionFrederic Weisbecker2014-03-131-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2014-03-3110-64/+146
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | s390/con3270: optionally disable auto updateMartin Schwidefsky2014-03-263-0/+17
| * | | | s390/smp: limit number of cpus in possible cpu maskHeiko Carstens2014-03-171-2/+21
| * | | | s390/sclp_early: Return correct HSA block count also for zeroMichael Holzheu2014-02-241-3/+5
| * | | | s390: improve debug feature usageSebastian Ott2014-02-213-6/+5
| * | | | s390/airq: add support for irq rangesMartin Schwidefsky2014-02-211-25/+41
| * | | | s390/cio: fix irq stats for early interrupts on ccw consolesSebastian Ott2014-02-211-8/+14
| * | | | s390/cio: reorder initialization of ccw consolesSebastian Ott2014-02-213-14/+32
| * | | | s390/cio: fix driver callback initialization for ccw consolesSebastian Ott2014-02-215-9/+14
| | |/ / | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-03-043-2/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | qeth: postpone freeing of qdio memoryUrsula Braun2014-02-253-2/+9
| |/ /
* | | s390/cio: Fix missing subchannels after CHPID configure onPeter Oberparleiter2014-02-211-0/+1
* | | s390/zcrypt: additional check to avoid overflow in msg-type 6 requestsIngo Tuchscherer2014-02-121-1/+23
|/ /
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2014-02-113-35/+21
|\ \ | |/ |/|
| * s390/cio: improve cio_commit_configSebastian Ott2014-02-061-26/+14
| * s390/qdio: correct program-controlled interruption checkingUrsula Braun2014-01-291-1/+1
| * s390/qdio: for_each macro correctnessJose Alonso2014-01-291-8/+6
* | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2014-01-311-2/+9
|\ \
| * \ Merge tag 'kvm-s390-20140117' of git://git.kernel.org/pub/scm/linux/kernel/gi...Paolo Bonzini2014-01-231-2/+9
| |\ \
| | * | KVM: s390: virtio-ccw: Handle command rejects.Cornelia Huck2014-01-171-2/+9
* | | | Merge branch 'for-3.14/core' of git://git.kernel.dk/linux-blockLinus Torvalds2014-01-307-67/+69
|\ \ \ \
| * \ \ \ Merge tag 'v3.13-rc6' into for-3.14/coreJens Axboe2013-12-313-4/+4
| |\ \ \ \
| * | | | | block: Convert bio_for_each_segment() to bvec_iterKent Overstreet2013-11-237-61/+61
| * | | | | block: Abstract out bvec iteratorKent Overstreet2013-11-232-6/+8
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-01-294-21/+51
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | qeth: fix build of s390 allmodconfigEugene Crosser2014-01-294-21/+51
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2014-01-283-4/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | s390/hypfs: add interface for diagnose 0x304Martin Schwidefsky2014-01-241-0/+5
| * | | | | s390/xpram: don't modify module parametersSebastian Ott2014-01-221-2/+3
| * | | | | s390/vmur: Link parent CCW device during UR device creationHendrik Brueckner2014-01-221-2/+2
| | |_|/ / | |/| | |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-01-259-53/+1194
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | qeth: bridgeport support - address notificationsEugene Crosser2014-01-156-0/+339
| * | | | s390/qdio: bridgeport support - CHSC partEugene Crosser2014-01-153-1/+174