Andy Fleming f38d1008b0 ucc_geth: Fix sneaky merge conflict regarding bus_id ... The patch that changed mdio_bus to a string didn't conflict strongly enough with the patch that added fixed PHY support to UCC. Gather it back into the fold. Fixes this error: ... CC drivers/net/ucc_geth.o 'ucc_geth_probe': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/ucc_geth.c:3935: error: incompatible types in assignment make[3]: *** [drivers/net/ucc_geth.o] Error 1 Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>		2008-04-25 02:07:09 -04:00
..
acorn/char
acpi	Add down_timeout and change ACPI to use it	2008-04-17 10:42:46 -04:00
amba
ata	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-04-18 11:25:31 -07:00
atm	drivers/atm: use time_before, time_before_eq, etc	2008-04-19 18:14:50 -07:00
auxdisplay
base	[SCSI] transport_class: BUG if we can't release the attribute container	2008-04-07 12:19:10 -05:00
block	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
bluetooth	hci_usb: remove code obfuscation	2008-04-19 18:17:26 -07:00
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb	2008-04-18 08:37:01 -07:00
clocksource
connector
cpufreq
cpuidle
crypto	[S390] zcrypt: add support for large random numbers	2008-04-17 07:47:02 +02:00
dca
dio
dma	dmaengine: ack to flags: make use of the unused bits in the 'ack' field	2008-04-17 13:25:54 -07:00
edac
eisa
firewire	firewire: cleanups	2008-04-18 17:55:37 +02:00
firmware	ipmi: change device node ordering to reflect probe order	2008-04-04 14:46:26 -07:00
gpio
hid
hwmon
i2c	i2c-tiny-usb: New VID/PID pair	2008-04-11 12:07:05 +02:00
ide	ide: remove ide_init_default_irq() macro	2008-04-18 00:46:35 +02:00
ieee1394	ieee1394: limit early node speed to host interface speed	2008-04-18 17:55:31 +02:00
infiniband	IB/iser: Don't change itt endianness	2008-04-16 21:09:35 -07:00
input	Input: appletouch - add product IDs for the 4th generation MacBooks	2008-04-02 10:14:29 -04:00
isdn	[ISDN]: Do not validate ISDN net device address prior to interface-up	2008-04-13 22:44:20 -07:00
leds	leds: Do not guard NEW_LEDS with HAS_IOMEM	2008-04-23 03:33:32 -07:00
lguest
macintosh	ide: rework PowerMac media-bay support (take 2)	2008-04-18 00:46:23 +02:00
mca
md	md: close a livelock window in handle_parity_checks5	2008-04-11 08:06:44 -07:00
media	pvrusb2: fix broken build due to patch order dependency	2008-04-07 19:14:34 -07:00
memstick
message	[SCSI] mpt fusion: fix up msi_enable in mpt_suspend	2008-04-07 12:19:02 -05:00
mfd
misc	kgdb: allow static kgdbts boot configuration	2008-04-17 20:05:43 +02:00
mmc	mmc: fix platform driver hotplug/coldplug	2008-04-15 19:35:40 -07:00
mtd	mtd/chips: add missing set_current_state() to cfi_{amdstd,staa}_sync()	2008-04-08 18:25:53 -07:00
net	ucc_geth: Fix sneaky merge conflict regarding bus_id	2008-04-25 02:07:09 -04:00
nubus
of
oprofile
parisc
parport	parport_pc: make sure to release IO ports after probing for IT87XX	2008-04-04 14:30:31 -07:00
pci
pcmcia	pcmcia: fix platform driver hotplug/coldplug	2008-04-15 19:35:40 -07:00
pnp
power
ps3
rapidio
rtc	rtc: fix the error in the function of cmos_set_alarm	2008-04-15 19:35:40 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26	2008-04-18 18:02:35 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-04-18 11:25:31 -07:00
serial	kgdb: Kconfig fix	2008-04-17 20:05:42 +02:00
sh
sn
spi	spi: spi_s3c24xx must initialize num_chipselect	2008-04-15 19:35:41 -07:00
ssb	ssb: Fix all-ones boardflags	2008-04-23 21:25:35 -04:00
tc
telephony
thermal	acpi thermal trip points increased to 12	2008-04-15 19:35:41 -07:00
uio
usb	USB: remove broken usb-serial num_endpoints check	2008-04-15 22:30:53 -07:00
video	fbdev: fix /proc/fb oops after module removal	2008-04-15 19:35:40 -07:00
virtio	virtio: remove overzealous BUG_ON.	2008-04-07 13:14:22 -07:00
w1
watchdog	watchdog: fix platform driver hotplug/coldplug	2008-04-11 08:06:44 -07:00
xen	xen: fix grant table bug	2008-04-04 18:36:46 +02:00
zorro
Kconfig
Makefile