ARM64: dts: rockchip: add usb otg node for rk3366
[firefly-linux-kernel-4.4.55.git] / Documentation / CodeOfConflict
2015-03-24 Greg Kroah-HartmanMerge tag 'iio-for-4.1a' of git://git./linux/kernel...
2015-03-24 David S. MillerMerge tag 'wireless-drivers-for-davem-2015-03-24' of...
2015-03-24 Mark BrownMerge remote-tracking branches 'spi/fix/dw', 'spi/fix...
2015-03-23 Marcelo TosattiMerge tag 'kvm-s390-next-20150318' of git://git./linux...
2015-03-23 Bjorn HelgaasMerge branches 'pci/enumeration' and 'pci/virtualizatio...
2015-03-23 Mark BrownMerge remote-tracking branches 'regulator/fix/doc'...
2015-03-23 Dmitry TorokhovMerge tag 'v4.0-rc5' into next
2015-03-23 Ingo MolnarMerge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
2015-03-23 Ingo MolnarMerge branch 'sched/urgent' into sched/core, to pick...
2015-03-23 Ingo MolnarMerge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts
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-19 Bjorn HelgaasMerge branches 'pci/iommu' and 'pci/resource' into...
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-17 Mark BrownMerge branch 'topic/jack' of git://git./linux/kernel...
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 Takashi IwaiMerge branch 'topic/hda-unbind' into for-next
2015-03-16 Takashi IwaiMerge branch 'topic/hda-bus' into for-next
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-14 David S. MillerMerge branch 'for-upstream' of git://git./linux/kernel...
2015-03-14 Wolfram SangMerge branch 'i2c/quirks' into i2c/for-4.1
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-13 Jens AxboeMerge branch 'for-linus' into for-4.1/core
2015-03-13 Ingo MolnarMerge tag 'v4.0-rc3' into x86/build, to refresh an...
2015-03-13 Kalle ValoMerge tag 'iwlwifi-next-for-kalle-2015-03-12' of https...
2015-03-13 Marcelo TosattiMerge tag 'kvm-s390-next-20150306' of git://git./linux...
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 Mark BrownMerge branch 'fix/intel' of git://git./linux/kernel...
2015-03-11 Mark BrownMerge tag 'v4.0-rc3' into asoc-intel
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 David S. MillerMerge git://git./linux/kernel/git/pablo/nf-next
2015-03-10 Rob HerringMerge tag 'v4.0-rc3' into HEAD
2015-03-10 Mark BrownMerge tag 'v4.0-rc3' into asoc-rt5670
2015-03-10 David S. MillerMerge git://git./linux/kernel/git/davem/net
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-09 Greg Kroah-HartmanMerge 4.0-rc3 into char-misc-next
2015-03-09 Takashi IwaiMerge branch 'for-linus' into for-next
2015-03-09 Greg Kroah-HartmanMerge 4.0-rc3 into staging-next
2015-03-09 Greg Kroah-HartmanMerge 4.0-rc3 into tty-testing
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