[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / hamradio / yam.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-11-04 David S. Millerdrivers/net: Kill now superfluous ->last_rx stores.
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 Stephen Hemminger[NET]: Move hardware header operations out of netdevice.
2007-10-10 Eric W. Biederman[NET]: Make /proc/net per network namespace
2007-07-22 Len BrownPull battery into release branch
2007-05-10 Linus TorvaldsMerge branch 'juju' of git://git./linux/kernel/git...
2007-05-10 Len BrownPull thermal into release branch
2007-05-09 Russell KingMerge branches 'armv7', 'at91', 'misc' and 'omap' into...
2007-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-07 Linus TorvaldsMerge branch 'server-cluster-locking-api' of git:/...
2007-05-07 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-06 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-05 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/voyager-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-05-01 Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-01 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-04-30 Tony LuckPull mem-attribute into release branch
2007-04-30 Tony LuckPull percpu-dtc into release branch
2007-04-30 Tony LuckPull error-inject into release branch
2007-04-30 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/jikos/hid
2007-04-30 Paul MackerrasMerge branch 'linux-2.6' into for-2.6.22
2007-04-29 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-04-27 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git.infradead.org...
2007-04-27 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-04-27 Linus TorvaldsMerge branch 'e1000-fixes' of /linux/kernel/git/jgarzik...
2007-04-27 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-04-27 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2007-04-27 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2007-04-26 Andrew Morton[NET]: Fix yam.c
2007-04-26 Arnaldo Carvalho... [SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}
2007-03-23 David WoodhouseMerge git://git./linux/kernel/git/joern/misc
2007-03-10 Len BrownPull bugzilla-7570 into release branch
2007-03-08 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/dtor...
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
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.o-hand.com/linux...
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-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2007-02-20 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-02-20 Russell KingMerge ARM fixes
2007-02-20 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-20 Jeff GarzikMerge branch 'upstream-jgarzik' of git://git./linux...
2007-02-20 Ralf BaechleReplace local random function with random32()
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 Jeff GarzikMerge branch 'gfar' of /linux/kernel/git/galak/powerpc...
2007-02-17 Kyle McMartinMerge branch 'parisc' from /home/kyle/repos/parisc...
2007-02-17 Len BrownPull bugzilla-7897 into release branch
2007-02-17 Len BrownPull bugzilla-7887 into release branch
2007-02-17 Len BrownPull bugzilla-7200 into release branch
2007-02-17 Len BrownPull remove-hotkey into release branch
next