[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / smc-ultra32.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-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 print_mac to %pM
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...
2007-10-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-10-12 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-12 Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2007-10-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-12 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-10-10 Joe Perches[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
2007-10-10 Ralf Baechle[NET]: Nuke SET_MODULE_OWNER macro.
2007-04-30 Tony LuckPull percpu-dtc into release branch
2007-04-30 Tony LuckPull error-inject into release branch
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2007-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-20 Russell KingMerge ARM fixes
2007-02-19 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of ssh:///linux/kernel/git...
2007-02-17 John W. LinvilleMerge branch 'upstream' into upstream-jgarzik
2007-02-17 Len BrownPull sony into release branch
2007-02-16 Len BrownPull misc-for-upstream into release branch
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-14 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2007-02-14 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-02-13 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2007-02-13 Kumar GalaMerge branch 'master' into 85xx
2007-02-13 Kumar GalaMerge branch 'master' into 83xx
2007-02-13 Kumar GalaMerge branch 'master' into for_paulus
2007-02-13 Paul MackerrasMerge branch 'for_paulus' of /linux/kernel/git/galak...
2007-02-11 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-11 Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-10 James BottomleyMerge branch 'linus'
2007-02-10 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-02-09 Jeff GarzikMerge branch 'upstream' of /linux/kernel/git/linville...
2007-02-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-09 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-09 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-09 Al Viro[PATCH] kill eth_io_copy_and_sum()
2007-02-03 Len BrownPull video into test branch
2007-01-17 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-12-20 Len BrownPull bugfix into test branch
2006-12-20 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull style into test branch
2006-12-16 Len BrownPull bugfix into test branch
2006-12-16 Len BrownPull trivial into test branch
2006-12-16 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull button into test branch
2006-12-16 Len BrownPull dock into test branch
2006-12-13 Russell King[ARM] Merge AT91 and devel branches
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-12-09 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-12-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-12-08 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-12-07 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2006-12-07 Linus TorvaldsMerge branch 'release' of /linux/kernel/git/aegl/linux-2.6
2006-12-07 Linus TorvaldsMerge branch 'intx' of /linux/kernel/git/jgarzik/misc-2.6
2006-12-07 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-12-07 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-12-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
2006-12-07 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-12-07 Jeff GarzikMerge tag 'r8169-upstream-20061204-00' of git://electri...
next