[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / epic100.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-26 David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-23 Neil Hormannet: Remove unused netdev arg from some NAPI interfaces.
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-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-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
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-13 Wang Chennetdevice: safe convert to netdev_priv() #part-2
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-11-04 David S. Millerdrivers/net: Kill now superfluous ->last_rx stores.
2008-10-31 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-31 Arjan van de Venpci: use pci_ioremap_bar() in drivers/net
2008-10-28 Johannes Bergnet: convert print_mac to %pM
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
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-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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-01 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2008-03-27 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27 Len BrownMerge branches 'release', 'idle', 'redhat-bugzilla...
2008-03-27 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-25 Paul MackerrasMerge branch 'linux-2.6'
2008-03-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-23 David S. MillerMerge branch 'upstream-net26' of /linux/kernel/git...
2008-03-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-23 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-17 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-17 Al Viroepic100 endianness annotations and fixes
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 'gpe-ack' 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-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-27 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-01-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-25 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-01-24 Paul MackerrasMerge branch 'for-2.6.25' of /linux/kernel/git/galak...
2008-01-23 Paul MackerrasMerge branch 'linux-2.6'
2008-01-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-17 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-12 Len BrownPull bugzilla-9535 into release branch
2008-01-12 Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2008-01-11 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.24
2008-01-11 Len BrownPull bugzilla-9683 into release branch
2008-01-11 Len BrownPull bugzilla-9627 into release branch
2008-01-11 Len BrownPull bugzilla-9535 into release branch
2008-01-11 Len BrownPull bugzilla-9494 into release branch
2008-01-11 Len BrownPull bugzilla-9194 into release branch
2008-01-11 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-01-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-01-09 David S. Miller[NET]: Do not check netif_running() and carrier state...
2007-11-20 Len BrownPull cpuidle into release branch
2007-10-29 Len BrownPull cpuidle into release branch
2007-10-23 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-19 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-17 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-15 Linus TorvaldsMerge branch 'locks' of git://linux-nfs.org/~bfields...
2007-10-15 Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-15 Linus TorvaldsMerge branch 'nfs-server-stable' of git://linux-nfs...
2007-10-14 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-10-14 David WoodhouseMerge branch 'master' of git://git.infradead.org/~dedek...
2007-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh64-2.6
2007-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2007-10-13 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-10-13 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-10-12 Russell KingMerge branches 'omap1-upstream' and 'omap2-upstream...
next