Merge tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm...
[deliverable/linux.git] / Documentation / CodeOfConflict
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-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  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...
2015-03-24  Mark BrownMerge remote-tracking branches 'spi/fix/dw', 'spi/fix...
2015-03-23  Mark BrownMerge remote-tracking branches 'regulator/fix/doc'...
2015-03-21  Linus TorvaldsMerge git://git./linux/kernel/git/nab/target-pending
2015-03-21  Linus TorvaldsMerge tag 'dm-4.0-fixes' of git://git./linux/kernel...
2015-03-21  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-21  Linus TorvaldsMerge tag 'upstream-4.0-rc5' of git://git.infradead...
2015-03-21  Linus TorvaldsMerge branch 'fixes' of git://ftp.arm.linux.org.uk...
2015-03-19  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-19  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-19  Linus TorvaldsMerge tag 'pinctrl-v4.0-2' of git://git./linux/kernel...
2015-03-19  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc
2015-03-18  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2015-03-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-17  Linus TorvaldsMerge branch 'x86-urgent-for-linus' of git://git./linux...
2015-03-17  Linus TorvaldsMerge branches 'perf-urgent-for-linus' and 'timers...
2015-03-17  Linus TorvaldsMerge tag 'regmap-v4.0-rc4' of git://git./linux/kernel...
2015-03-17  Linus TorvaldsMerge tag 'virtio-next-for-linus' of git://git./linux...
2015-03-16  Marcelo TosattiMerge tag 'kvm-arm-fixes-4.0-rc5' of git://git./linux...
2015-03-16  David S. MillerMerge tag 'mac80211-for-davem-2015-03-16' of git:/...
2015-03-16  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2015-03-16  Arnd BergmannMerge tag 'v4.0-rockchip-armfixes1' of git://git./linux...
2015-03-16  Mark BrownMerge remote-tracking branches 'asoc/fix/sgtl5000'...
2015-03-16  Mark BrownMerge remote-tracking branches 'asoc/fix/ak4671', ...
2015-03-16  Mark BrownMerge remote-tracking branch 'asoc/fix/intel' into...
2015-03-16  Mark BrownMerge remote-tracking branches 'regulator/fix/gpio...
2015-03-15  Linus TorvaldsMerge tag 'clk-fixes-for-linus' of git://git./linux...
2015-03-15  Linus TorvaldsMerge tag 'fixes-for-linus' of git://git./linux/kernel...
2015-03-15  Linus TorvaldsMerge tag 'irqchip-fixes-4.0' of git://git.infradead...
2015-03-15  Greg Kroah-HartmanMerge tag 'for-4.0-rc' of git://git./linux/kernel/git...
2015-03-14  Linus TorvaldsMerge tag 'scsi-fixes' of git://git./linux/kernel/git...
2015-03-13  Linus TorvaldsMerge tag 'stable/for-linus-4.0-rc3-tag' of git://git...
2015-03-13  Linus TorvaldsMerge branch 'gadget' of git://git./linux/kernel/git...
2015-03-12  Linus TorvaldsMerge tag 'pci-v4.0-fixes-2' of git://git./linux/kernel...
2015-03-12  Linus TorvaldsMerge tag 'microblaze-4.0-rc4' of git://git.monstr...
2015-03-11  Linus TorvaldsMerge tag 'for-linus-20150310' of git://git.infradead...
2015-03-11  Linus TorvaldsMerge tag 'iommu-fixes-v4.0-rc3' of git://git./linux...
2015-03-10  David S. MillerMerge tag 'wireless-drivers-for-davem-2015-03-10' of...
2015-03-10  Rob HerringMerge tag 'v4.0-rc3' into HEAD
2015-03-10  Linus TorvaldsMerge git://git.kernel.org/pub/scm/virt/kvm/kvm
2015-03-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge tag 'trace-fixes-v4.0-rc2-2' of git://git./linux...
2015-03-10  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net
2015-03-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge tag 'regulator-v4.0-rc2' of git://git./linux...
2015-03-10  Linus TorvaldsMerge tag 'spi-v4.0-rc2' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge tag 'fbdev-fixes-4.0' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-09  James MorrisMerge branch 'for-current' of https://github.com/PeterH...
2015-03-09  Dave AirlieMerge tag 'v4.0-rc3' into drm-next
2015-03-08  Linus TorvaldsMerge tag 'usb-4.0-rc3' of git://git./linux/kernel...
2015-03-08  Linus TorvaldsMerge tag 'tty-4.0-rc3' of git://git./linux/kernel...
2015-03-08  Linus TorvaldsMerge tag 'staging-4.0-rc3' of git://git./linux/kernel...
2015-03-08  Linus TorvaldsMerge tag 'char-misc-4.0-rc3' of git://git./linux/kerne...
2015-03-08  Linus TorvaldsMerge tag 'cc-4.0-rc2' of git://git./linux/kernel/git...
2015-02-27  Greg Kroah-HartmanCode of Conflict
This page took 5.696703 seconds and 73 git commands to generate.