Christian Lamparter c88a768d7e p54usb: fix conflict with recent usb changes ... A recent change in the usb core "USB: change interface to usb_lock_device_for_reset()" conflicts with "p54usb: utilize usb_reset_device for 3887". Sadly, we have to call usb_reset_device before we can upload the firmware on 3887. Unless someone figures out how to reliably stop the 3887 so the hardware is still usable next time we want to start it. Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2009-01-29 16:00:43 -05:00
..
accessibility
acpi	Merge branch 'misc' into release	2009-01-16 14:45:34 -05:00
amba
ata	sata_fsl: Return non-zero on error in probe()	2009-01-16 10:23:58 -05:00
atm
auxdisplay
base	driver core: Convert '/' to '!' in dev_set_name()	2009-01-20 20:52:08 -08:00
block	powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block	2009-01-16 16:15:13 +11:00
bluetooth
cdrom
char	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-01-26 17:43:16 -08:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma	i.MX31: Image Processing Unit DMA and IRQ drivers	2009-01-19 15:36:21 -07:00
edac
eisa
firewire
firmware	dell_rbu: use scnprintf() instead of less secure sprintf()	2009-01-17 14:27:18 -08:00
gpio	gpio: fix probe() error return in gpio driver probes	2009-01-15 16:39:35 -08:00
gpu	Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-01-26 15:11:41 -08:00
hid
hwmon	Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-01-15 16:40:12 -08:00
i2c	i2c: Move old eeprom driver to /drivers/misc/eeprom	2009-01-26 21:19:53 +01:00
ide	drivers/ide/palm_bk3710.c buildfix	2009-01-19 13:46:57 +01:00
idle
ieee1394	i2c: Delete many unused adapter IDs	2009-01-26 21:19:52 +01:00
infiniband	iw_cxgb3: handle chip reset notifications	2009-01-26 22:22:19 -08:00
input
isdn	isdn: Fix missing ifdef in isdn_ppp	2009-01-26 12:24:38 -08:00
leds	lis3lv02d: merge with leds hp disk	2009-01-15 16:39:40 -08:00
lguest
macintosh
mca
md
media
memstick
message
mfd
misc	eeprom: More consistent symbol names	2009-01-26 21:19:57 +01:00
mmc	[ARM] 5369/1: omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3	2009-01-24 11:41:21 +00:00
mtd
net	p54usb: fix conflict with recent usb changes	2009-01-29 16:00:43 -05:00
nubus
of
oprofile	oprofile: fix uninitialized use of struct op_entry	2009-01-17 17:26:39 +01:00
parisc
parport
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-01-26 10:13:36 -08:00
pcmcia
platform	Merge branch 'misc' into release	2009-01-16 14:45:34 -05:00
pnp
power	power_supply: pda_power: Don't request shared IRQs w/ IRQF_DISABLED	2009-01-26 02:09:26 +03:00
ps3	powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3	2009-01-16 16:15:14 +11:00
rapidio
regulator	move wm8400-regulator's probe function to .devinit.text	2009-01-17 13:46:40 +00:00
rtc	rtc: rtc-twl4030 don't mask alarm interrupts on shutdown	2009-01-15 16:39:36 -08:00
s390	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-01-26 17:43:16 -08:00
sbus
scsi	cxgb3: Replace LRO with GRO	2009-01-21 14:39:13 -08:00
serial	sh: fix sh-sci / early printk build on sh7723	2009-01-21 17:44:32 +09:00
sh
sn
spi	spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom	2009-01-26 21:19:54 +01:00
ssb	b43/ssb: Add SPROM8 extraction and LP-PHY detection	2009-01-29 15:59:38 -05:00
staging
tc
telephony
thermal
uio
usb	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2009-01-26 15:12:47 -08:00
uwb
video	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2009-01-26 15:12:47 -08:00
virtio
w1
watchdog	[ARM] omap: watchdog: allow OMAP watchdog driver on OMAP34xx platforms	2009-01-24 16:48:42 +00:00
xen	xen: unitialised return value in xenbus_write_transaction	2009-01-26 14:29:26 +01:00
zorro
Kconfig
Makefile