tipc: fix build issue when building without IPv6
[cascardo/linux.git] / Documentation / CodeOfConflict
2015-03-14 David S. MillerMerge branch 'for-upstream' of git://git./linux/kernel...
2015-03-10 David S. MillerMerge git://git./linux/kernel/git/pablo/nf-next
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-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