git.cascardo.info Git - cascardo/linux.git/history

projects / cascardo / linux.git / history

[cascardo/linux.git] / Documentation / CodeOfConflict

2016-10-07	Linus Torvalds	Merge branch 'i2c/for-4.9' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'pci-v4.9-changes' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'vfio-v4.9-rc1' of git://github.com/awilliam...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'md/4.9-rc1' of git://git./linux/kernel/git...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'scsi-misc' of git://git./linux/kernel/git...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'mfd-for-linus-4.9' of git://git./linux/kerne...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'backlight-for-linus-4.9' of git://git./linux...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'hsi-for-4.9' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'for-v4.9' of git://git./linux/kernel/git...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge branch 'mailbox-for-next' of git://git.linaro...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'dmaengine-4.9-rc1' of git://git.infradead...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'rpmsg-v4.9' of git://github.com/andersson...	blob \| commitdiff \| raw
2016-10-07	Linus Torvalds	Merge tag 'rproc-v4.9' of git://github.com/andersson...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'for-f2fs-4.9' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'pstore-v4.9-rc1' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'for-linus-4.9-ofs1' of git://git./linux...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'trace-v4.9' of git://git./linux/kernel/git...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'for-linus-4.9-rc0-tag' of git://git./linux...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'kvm-4.9-1' of git://git./virt/kvm/kvm	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'xfs-for-linus-4.9-rc1' of git://git./linux...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge git://git./linux/kernel/git/davem/sparc	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge branch 'for-linus' of git://git.armlinux.org...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge branch 'fixes' of git://git.armlinux.org.uk/...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge branch 'for-next' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-06	Linus Torvalds	Merge tag 'xtensa-20161005' of git://github.com/jcmvbkb...	blob \| commitdiff \| raw
2016-10-06	David S. Miller	Merge git://git./linux/kernel/git/pablo/nf-next	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge tag 'staging-4.9-rc1' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge tag 'sound-4.9-rc1' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge tag 'devicetree-for-4.9' of git://git./linux...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge tag 'gpio-v4.9-1' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge tag 'pinctrl-v4.9-1' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge tag 'mmc-v4.9' of git://git.linaro.org/people...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge branch 'for_linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-05	Linus Torvalds	Merge git://git./linux/kernel/git/davem/net-next	blob \| commitdiff \| raw
2016-10-04	Linus Torvalds	Merge branch 'next' of git://git./linux/kernel/git...	blob \| commitdiff \| raw
2016-10-04	Linus Torvalds	Merge branch 'stable-4.9' of git://git.infradead.org...	blob \| commitdiff \| raw
2016-10-04	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw
2016-10-04	Linus Torvalds	Merge tag 'docs-4.9' of git://git.lwn.net/linux	blob \| commitdiff \| raw
2016-10-01	Jon Bailey	URL changed for Linux Foundation TAB	blob \| commitdiff \| raw
2016-09-19	Greg Kroah-Hartman	Merge greybus driver tree into 4.8-rc6	blob \| commitdiff \| raw \| diff to current
2016-02-23	Laxman Dewangan	Merge remote-tracking branch 'linusw-gpio/for-next...	blob \| commitdiff \| raw \| diff to current
2016-02-01	Jens Axboe	Merge branch 'for-4.5/for-jens' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-08-07	Linus Torvalds	Merge branch 'drm-tda998x-fixes' of git://ftp.arm.linux...	blob \| commitdiff \| raw \| diff to current
2015-07-21	Ingo Molnar	Merge tag 'efi-urgent' of git://git./linux/kernel/git...	blob \| commitdiff \| raw \| diff to current
2015-06-23	Al Viro	Merge branch 'fscache-fixes' into for-next	blob \| commitdiff \| raw \| diff to current
2015-06-23	Linus Torvalds	Merge branch 'for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-06-22	Mark Brown	Merge remote-tracking branches 'regulator/fix/doc'...	blob \| commitdiff \| raw \| diff to current
2015-06-19	Joerg Roedel	Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu...	blob \| commitdiff \| raw \| diff to current
2015-06-19	Michael Turquette	Merge branch 'ccf/atmel-fixes-for-4.1' of https://githu...	blob \| commitdiff \| raw \| diff to current
2015-06-17	Mark Brown	Merge remote-tracking branches 'spi/topic/sirf', 'spi...	blob \| commitdiff \| raw \| diff to current
2015-06-17	Mark Brown	Merge remote-tracking branches 'spi/topic/pxa', 'spi...	blob \| commitdiff \| raw \| diff to current
2015-06-09	Mark Brown	Merge branch 'fix/fsl-dspi' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-05-28	Dave Airlie	Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux...	blob \| commitdiff \| raw \| diff to current
2015-05-15	Dave Airlie	Merge branch 'drm-armada-devel' of git://ftp.arm.linux...	blob \| commitdiff \| raw \| diff to current
2015-05-15	Dave Airlie	Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux...	blob \| commitdiff \| raw \| diff to current
2015-05-13	Arnd Bergmann	Merge tag 'v4.1-rockchip-socfixes2' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-05-11	Mark Brown	Merge remote-tracking branches 'spi/fix/fsl-cpm', ...	blob \| commitdiff \| raw \| diff to current
2015-05-08	Mark Brown	Merge remote-tracking branch 'spi/fix/omap2-mcspi'...	blob \| commitdiff \| raw \| diff to current
2015-05-07	Arnd Bergmann	Merge tag 'v4.1-rockchip-socfixes1' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-05-06	Ingo Molnar	Merge tag 'efi-urgent' of git://git./linux/kernel/git...	blob \| commitdiff \| raw \| diff to current
2015-05-04	Linus Torvalds	Merge tag 'for_linus_stable' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-29	Mark Brown	Merge remote-tracking branches 'asoc/fix/rt5677', ...	blob \| commitdiff \| raw \| diff to current
2015-04-29	Mark Brown	Merge remote-tracking branches 'asoc/fix/email', 'asoc...	blob \| commitdiff \| raw \| diff to current
2015-04-29	Mark Brown	Merge remote-tracking branch 'asoc/fix/rt5645' into...	blob \| commitdiff \| raw \| diff to current
2015-04-29	Mark Brown	Merge remote-tracking branch 'asoc/fix/dapm' into asoc...	blob \| commitdiff \| raw \| diff to current
2015-04-28	Kalle Valo	Merge ath-next from ath.git	blob \| commitdiff \| raw \| diff to current
2015-04-27	Mark Brown	Merge branch 'fix/rt5645' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-27	Mauro Carvalho Chehab	Merge tag 'v4.1-rc1' into patchwork	blob \| commitdiff \| raw \| diff to current
2015-04-27	Linus Torvalds	Merge git://git.infradead.org/intel-iommu	blob \| commitdiff \| raw \| diff to current
2015-04-26	Linus Torvalds	Merge tag 'platform-drivers-x86-v4.1-1' of git://git...	blob \| commitdiff \| raw \| diff to current
2015-04-26	Linus Torvalds	Merge tag 'chrome-for-linus' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-24	Linus Torvalds	Merge branch 'for-next' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-24	Linus Torvalds	Merge tag 'pwm/for-4.1-rc1' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-24	Linus Torvalds	Merge branch 'for-linus' of git://git.infradead.org...	blob \| commitdiff \| raw \| diff to current
2015-04-24	Linus Torvalds	Merge tag 'xfs-for-linus-4.1-rc1' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-04-24	Mark Brown	Merge remote-tracking branches 'spi/fix/bcm2835', ...	blob \| commitdiff \| raw \| diff to current
2015-04-23	Russell King	Merge branches 'misc' and 'vdso' into for-next	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge branch 'upstream' of git://git.infradead.org...	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge tag 'for-linus-20150422' of git://git.infradead...	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge tag 'armsoc-late' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge tag 'armsoc-arm64' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge tag 'armsoc-defconfig' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge tag 'armsoc-multiplatform' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-04-22	Linus Torvalds	Merge tag 'armsoc-soc' of git://git./linux/kernel/git...	blob \| commitdiff \| raw \| diff to current
2015-04-21	NeilBrown	Merge branch 'cluster' into for-next	blob \| commitdiff \| raw \| diff to current
2015-04-21	Linus Torvalds	Merge tag 'clk-for-linus-4.1' of git://git./linux/kerne...	blob \| commitdiff \| raw \| diff to current
2015-04-21	Mauro Carvalho Chehab	Merge branch 'drm-next-merged' of git://people.freedesk...	blob \| commitdiff \| raw \| diff to current
2015-04-20	Linus Torvalds	Merge tag 'remoteproc-4.1-next' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-04-20	Linus Torvalds	Merge branch 'misc' of git://git./linux/kernel/git...	blob \| commitdiff \| raw \| diff to current
2015-04-20	Linus Torvalds	Merge tag 'scsi-misc' of git://git./linux/kernel/git...	blob \| commitdiff \| raw \| diff to current
2015-04-20	Linus Torvalds	Merge tag 'fbdev-4.1' of git://git./linux/kernel/git...	blob \| commitdiff \| raw \| diff to current
2015-04-20	Linus Torvalds	Merge tag 'cpumask-next-for-linus' of git://git./linux...	blob \| commitdiff \| raw \| diff to current
2015-04-20	Olof Johansson	Merge branch 'fixes' into next/fixes-non-critical	blob \| commitdiff \| raw \| diff to current
2015-04-19	Linus Torvalds	Merge tag 'ext4_for_linus' of git://git./linux/kernel...	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom