ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / drivers / net / fec_8xx / Kconfig
2007-07-22  Len BrownPull netlink into release branch
2007-07-22  Len BrownPull osi into release branch
2007-07-22  Len BrownPull video into release branch
2007-07-22  Len BrownPull throttle into release branch
2007-07-22  Len BrownPull misc into release branch
2007-07-22  Len BrownPull dock-bay into release branch
2007-07-22  Len BrownPull bugzilla-7880 into release branch
2007-07-22  Len BrownPull ec into release branch
2007-07-22  Len BrownPull sbs into release branch
2007-07-22  Len BrownPull battery into release branch
2007-07-22  Len BrownPull acpi-debug into release branch
2007-07-22  Len BrownPull acpica into release branch
2007-07-19  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2007-07-19  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-07-17  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-16  Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-13  Linus TorvaldsMerge branch 'ioat-md-accel-for-linus' of git://lost...
2007-07-12  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-07-12  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-12  David S. MillerMerge /linux/kernel/git/holtmann/bluetooth-2.6
2007-07-11  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-07-11  Paul MackerrasMerge branch 'for-2.6.23' into merge
2007-07-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-10  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-10  Linus TorvaldsMerge git://git.infradead.org/~dwmw2/battery-2.6
2007-07-10  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-07-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-09  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-09  Jan EngelhardtUse menuconfig objects II - netdev (general+100mbit)
2006-01-24  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-01-03  Dave Airliedrm: merge in Linus mainline
2005-12-06  Len BrownPull release into acpica branch
2005-11-22  Jody McIntyreMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-21  Dave JonesMerge ../linus/
2005-11-21  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-20  Jeff GarzikMerge branch 'master'
2005-11-20  Jeff GarzikMerge branch 'upstream'
2005-11-20  Jeff GarzikMerge branch 'upstream'
2005-11-20  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-19  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-19  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-11-19  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-19  Paul MackerrasMerge branch 'mymerge' of ssh://ozlabs.org/home/sfr...
2005-11-19  Jeff GarzikMerge branch 'master'
2005-11-18  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2005-11-18  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-18  Linus TorvaldsMerge branch 'for-linus' of git://brick.kernel.dk/data...
2005-11-18  Kyle McMartinMerge branch 'master'
2005-11-18  Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2005-11-18  Jeff GarzikMerge branch 'upstream-fixes'
2005-11-18  Jeff GarzikMerge branch 'upstream-fixes' of git://git.tuxdriver...
2005-11-18  John W. Linville[PATCH] fec_8xx: make CONFIG_FEC_8XX depend on CONFIG_8xx
2005-11-18  Jody McIntyreMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-15  Linus TorvaldsMerge x86-64 update from Andi
2005-11-11  Jeff GarzikMerge branch 'atmel'
2005-11-11  Jeff GarzikMerge branch 'master'
2005-11-11  Jeff GarzikMerge branch 'master'
2005-11-10  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-11-10  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-10  Tony LuckPull context-bitmap into release branch
2005-11-10  Jeff GarzikMerge branch 'master'
2005-11-09  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-09  Jeff GarzikMerge branch 'upstream'
2005-11-09  Jeff GarzikMerge branch 'upstream'
2005-11-09  Jeff GarzikMerge branch 'master'
2005-11-08  James BottomleyMerge by hand (conflicts between pending drivers and...
2005-11-08  Jeff GarzikMerge git://git.tuxdriver.com/git/netdev-jwl
2005-11-08  Paul MackerrasMerge ../linux-2.6
2005-11-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-07  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-11-07  Tony LuckAuto-update from upstream
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bunk/trivial
2005-11-07  Linus TorvaldsMerge branch 'block-dir' of git://brick.kernel.dk/data...
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-11-07  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-07  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-07  Jeff GarzikMerge branch 'master'
2005-11-07  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-11-07  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-06  Jeff Garzik[netdrvr] fac_8xx build fix
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-05  Jeff GarzikMerge branch 'master'
2005-10-31  Jeff GarzikMerge branch 'master'
2005-10-29  Pantelis Antoniou[PATCH] fec_8xx: Add support for Intel PHY LX971
next