[XFS] Fix merge failures
[pandora-kernel.git] / arch / um / drivers / slirp_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
2007-11-20 Len BrownPull cpuidle into release branch
2007-11-17 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-29 Len BrownPull cpuidle into release branch
2007-10-24 Jeff GarzikMerge branch 'upstream-jeff' of git://git./linux/kernel...
2007-10-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-21 Linus TorvaldsMerge branch 'master' of hera./linux/kernel/git/kyle...
2007-10-20 Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
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-19 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-18 Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2007-10-18 Linus TorvaldsMerge ssh:///linux/kernel/git/tglx/linux-2.6-hrt
2007-10-18 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-18 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-10-18 Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2007-10-18 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-10-18 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-10-18 David S. MillerMerge branch 'fixes-davem' of /linux/kernel/git/linvill...
2007-10-18 Jeff Dike[UMP]: header_ops conversion needed for non-ethernet...
2007-10-17 Linus TorvaldsMerge branch 'xen-upstream' of git://git./linux/kernel...
2007-10-17 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-17 Paul MackerrasMerge branch 'for-2.6.24' of git://git.secretlab.ca...
2007-10-17 Paul MackerrasMerge branch 'fixes-2.6.24' of /linux/kernel/git/galak...
2007-10-16 Linus TorvaldsMerge ssh:///pub/scm/linux/kernel/git/sam/kbuild
2007-10-16 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-10-16 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-10-16 Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2007-10-16 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/data...
2007-10-16 Jeff Dikeuml: network driver MTU cleanups
2007-10-16 Jeff Dikeuml: network formatting
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 Arnaldo Carvalho... [SK_BUFF]: Introduce skb_mac_header()
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...
next