[XFS] Fix merge failures
[linux-2.6] / arch / um / drivers / net_kern.c
2008-12-29  Lachlan McIlroy[XFS] Fix merge failures
2008-12-29  Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28  James MorrisMerge branch 'next' into for-linus
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-24  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-06  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-04  Wang Chenum: Kill directly reference of netdev->priv
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-27  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-21  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-19  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-11  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-31  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-28  Johannes Bergnet: convert more to %pM
2008-07-10  Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03  Russell KingMerge branch 'fb' into devel
2008-05-08  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-05-07  Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-06  Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-05-03  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-05-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-05-01  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01  Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-05-01  David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-05-01  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30  Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-30  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30  Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-04-29  Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29  Linus TorvaldsMerge branch 'audit.b50' of git://git./linux/kernel...
2008-04-29  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-29  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28  Igor MammedovMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-04-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-28  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-28  Linus TorvaldsMerge git://git./linux/kernel/git/tglx/linux-2.6-hrt
2008-04-28  WANG Conguml: make several things static
2008-04-24  Trond MyklebustMerge branch 'devel'
2008-04-22  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20  Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-19  Russell KingMerge branch 'omap2-upstream' into devel
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Paul MackerrasMerge branch 'master' of git://git./linux/kernel/git...
2008-04-17  Tony LuckPull regset into release branch
2008-04-17  Tony LuckPull virt-cpu-accounting into release branch
2008-04-17  Tony LuckPull fsys_gettimeofday into release branch
2008-04-16  Paul MackerrasMerge branch 'for-2.6.26' of /linux/kernel/git/olof...
2008-04-14  Paul MackerrasMerge branch 'linux-2.6'
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-04-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-01  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-04-01  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-04-01  Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2008-03-28  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-27  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-27  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-27  Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-03-27  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-26  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-26  Patrick McHardy[UML]: uml-net: don't set IFF_ALLMULTI in set_multicast...
2008-02-18  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-09  David S. MillerMerge branch 'pending' of /linux/kernel/git/vxy/lksctp-dev
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-02-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-07  Len BrownMerge branches 'release' and 'throttling-domains' into...
2008-02-07  Len BrownMerge branches 'release' and 'wmi-2.6.25' into release
2008-02-07  Len BrownMerge branches 'release' and 'menlo' into release
2008-02-07  Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07  Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07  Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07  Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07  Len BrownMerge branches 'release' and 'dmi' into release
2008-02-07  Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07  Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07  Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07  Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07  Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-07  Josh BoyerMerge branch 'virtex-for-2.6.25' of git://git.secretlab...
2008-02-07  Paul MackerrasMerge branch 'for-2.6.25' of git://git.secretlab.ca...
2008-02-06  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-06  David S. MillerMerge branch 'upstream-davem' of /linux/kernel/git...
next