Restartable sequences: tests: introduce simple rseq start/finish
[deliverable/linux.git] / Documentation / CodeOfConflict
2015-04-12  Mark BrownMerge remote-tracking branches 'asoc/topic/link-param...
2015-04-12  Mark BrownMerge remote-tracking branches 'asoc/topic/jack', ...
2015-04-12  Mark BrownMerge remote-tracking branches 'asoc/topic/dmaengine...
2015-04-12  Mark BrownMerge remote-tracking branches 'asoc/topic/cx20442...
2015-04-12  Mark BrownMerge remote-tracking branches 'asoc/topic/4554', ...
2015-04-12  Mark BrownMerge remote-tracking branch 'asoc/topic/rt5645' into...
2015-04-12  Mark BrownMerge remote-tracking branch 'asoc/topic/dapm' into...
2015-04-12  Mark BrownMerge tag 'asoc-v4.1' into asoc-next
2015-04-12  Mark BrownMerge remote-tracking branch 'asoc/fix/wm8741' into...
2015-04-12  Mark BrownMerge remote-tracking branches 'asoc/fix/ak4642', ...
2015-04-12  Mark BrownMerge remote-tracking branch 'asoc/fix/pcm512x' into...
2015-04-12  Mark BrownMerge remote-tracking branch 'asoc/fix/intel' into...
2015-04-12  Mark BrownMerge tag 'asoc-fix-v4.0-rc7' into asoc-linus
2015-04-12  Al ViroMerge branch 'iov_iter' into for-next
2015-04-12  Al ViroMerge branch 'iocb' into for-next
2015-04-11  Linus TorvaldsMerge tag 'asoc-fix-v4.0-rc7' of git://git./linux/kerne...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/topic/spidev' and...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/topic/qup', 'spi...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/topic/omap-100k...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/topic/fsl-cspi...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/topic/blackfin...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/topic/atmel', ...
2015-04-11  Mark BrownMerge remote-tracking branch 'spi/topic/core' into...
2015-04-11  Mark BrownMerge remote-tracking branches 'spi/fix/fsl-dspi',...
2015-04-11  Mark BrownMerge remote-tracking branch 'spi/fix/img-spfi' into...
2015-04-11  Thomas GleixnerMerge tag 'irqchip-core-4.1-3' of git://git.infradead...
2015-04-11  Thomas GleixnerMerge tag 'irqchip-core-4.1-2' of git://git.infradead...
2015-04-11  Linus TorvaldsMerge tag 'scsi-fixes' of git://git./linux/kernel/git...
2015-04-10  Linus TorvaldsMerge git://git./linux/kernel/git/nab/target-pending
2015-04-10  Mark BrownMerge remote-tracking branch 'regulator/topic/wm8350...
2015-04-10  Mark BrownMerge remote-tracking branches 'regulator/topic/mode...
2015-04-10  Mark BrownMerge remote-tracking branches 'regulator/topic/dbx500...
2015-04-10  Mark BrownMerge remote-tracking branches 'regulator/topic/act8865...
2015-04-10  Mark BrownMerge remote-tracking branch 'regulator/topic/core...
2015-04-10  Mark BrownMerge branch 'topic/dapm-dt' of git://git./linux/kernel...
2015-04-10  Mark BrownMerge branch 'topic/delay' of git://git./linux/kernel...
2015-04-10  Bjorn HelgaasMerge branch 'pci/misc' into next
2015-04-10  Bjorn HelgaasMerge branches 'pci/host-exynos', 'pci/host-iproc'...
2015-04-10  Greg Kroah-HartmanMerge tag 'for-4.1' of git://git./linux/kernel/git...
2015-04-10  Rafael J. WysockiMerge back earlier suspend/hibernate material for v4.1.
2015-04-09  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2015-04-09  Linus TorvaldsMerge tag 'pci-v4.0-fixes-3' of git://git./linux/kernel...
2015-04-09  Mark BrownMerge tag 'v4.0-rc7' into asoc-core
2015-04-09  Al ViroMerge branch 'iov_iter' into for-davem
2015-04-09  Al ViroMerge branch 'iocb' into for-davem
2015-04-08  Thomas GleixnerMerge tag 'irqchip-core-4.0' of git://git.infradead...
2015-04-08  Thomas GleixnerMerge branch 'linus' into irq/core to get the GIC updat...
2015-04-08  Mark BrownMerge branch 'fix/img-spfi' of git://git./linux/kernel...
2015-04-08  Mark BrownMerge tag 'v4.0-rc7' into spi-img-spfi
2015-04-08  Dave AirlieMerge tag 'drm/panel/for-4.1-rc1' of git://anongit...
2015-04-08  Dave AirlieMerge tag 'drm/tegra/for-4.1-rc1' of git://anongit...
2015-04-08  Linus TorvaldsMerge tag 'media/v3.20-2' of git://git./linux/kernel...
2015-04-07  Kalle ValoMerge tag 'iwlwifi-next-for-kalle-2015-04-02' of https...
2015-04-07  Paolo BonziniMerge tag 'kvm-s390-next-20150331' of git://git./linux...
2015-04-07  Paolo BonziniMerge tag 'kvm-arm-for-4.1' of git://git./linux/kernel...
2015-04-07  Paolo BonziniMerge tag 'kvm-arm-fixes-4.0-rc5' of git://git./linux...
2015-04-06  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-04-03  Olof JohanssonMerge tag 'samsung-dt' of git://git./linux/kernel/git...
2015-04-03  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-04-03  Olof JohanssonMerge tag 'mvebu-dt-4.1-3' of git://git.infradead.org...
2015-04-03  Olof JohanssonMerge tag 'samsung-fixes-2' of git://git./linux/kernel...
2015-04-03  Olof JohanssonMerge tag 'v4.0-next-soc' of https://github.com/mbgg...
2015-04-03  Olof JohanssonMerge tag 'v4.0-next-dts' of https://github.com/mbgg...
2015-04-03  Olof JohanssonMerge tag 'imx-cleanup-4.1' of git://git./linux/kernel...
2015-04-03  Olof JohanssonMerge tag 'mvebu-fixes-4.0' of git://git.infradead...
2015-04-03  Olof JohanssonMerge tag 'tegra-for-4.1-dt' of git://git./linux/kernel...
2015-04-03  Olof JohanssonMerge tag 'arm-perf-4.1' of git://git./linux/kernel...
2015-04-03  Olof JohanssonMerge tag 'omap-for-v4.1/wl12xx-dt' of git://git./linux...
2015-04-03  Olof JohanssonMerge tag 'qcom-cleanup-for-4.1' of git://git./linux...
2015-04-03  Greg Kroah-HartmanMerge tag 'usb-serial-4.1-rc1' of git://git./linux...
2015-04-02  Linus TorvaldsMerge tag 'irqchip-fixes-4.0-2' of git://git.infradead...
2015-04-02  Linus TorvaldsMerge tag 'stable/for-linus-4.0-rc6-tag' of git://git...
2015-04-02  Joerg RoedelMerge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd...
2015-04-01  David S. MillerMerge tag 'wireless-drivers-for-davem-2015-04-01' of...
2015-04-01  David S. MillerMerge tag 'mac80211-for-davem-2015-04-01' of git:/...
2015-04-01  Linus TorvaldsMerge tag 'lazytime_fix' of git://git./linux/kernel...
2015-04-01  Greg Kroah-HartmanMerge tag 'extcon-next-for-4.1' of git://git./linux...
2015-03-31  David S. MillerMerge tag 'mac80211-next-for-davem-2015-03-30' of git...
2015-03-31  Ingo MolnarMerge tag 'efi-urgent' of git://git./linux/kernel/git...
2015-03-31  Ingo MolnarMerge tag 'v4.0-rc6' into timers/core, before applying...
2015-03-30  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-30  Linus TorvaldsMerge tag 'gpio-v4.0-3' of git://git./linux/kernel...
2015-03-29  Olof JohanssonMerge tag 'sunxi-fixes-for-4.0' of https://git./linux...
2015-03-29  Olof JohanssonMerge tag 'fixes-v4.0-rc4' of git://git./linux/kernel...
2015-03-29  Olof JohanssonMerge tag 'fixes-for-v4.0-rc5' of https://github.com...
2015-03-27  James MorrisMerge branch 'upstream' of git://git.infradead.org...
2015-03-27  Ingo MolnarMerge branch 'timers/core' into perf/timer, to apply...
2015-03-27  Ingo MolnarMerge branch 'for-mingo' of git://git./linux/kernel...
2015-03-27  Ingo MolnarMerge branch 'perf/x86' into perf/core, because it...
2015-03-27  Ingo MolnarMerge branch 'perf/urgent' into perf/core, to pick...
2015-03-27  Mark BrownMerge tag 'v4.0-rc5' into spi-bcm2835
2015-03-26  Linus TorvaldsMerge tag 'dm-4.0-fix-2' of git://git./linux/kernel...
2015-03-25  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2015-03-25  Chris MasonMerge branch 'cleanup/divs' of git://git./linux/kernel...
2015-03-25  Chris MasonMerge branch 'cleanups-post-3.19' of git://git./linux...
2015-03-25  Chris MasonMerge branch 'cleanups-for-4.1-v2' of git://git./linux...
2015-03-25  Artem BityutskiyMerge tag 'v4.0-rc5' into linux-next
2015-03-25  Rob HerringMerge tag 'of-graph-for-4.0' of git://git.pengutronix...
2015-03-25  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-24  Linus TorvaldsMerge tag 'regmap-fix-v4.0-rc5' of git://git./linux...
next
This page took 1.361241 seconds and 107 git commands to generate.