Herbert Xu 58dfd9c16e [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge ... There has been an update to the forcedeth driver that added a few new uses of xmit_lock which is no longer meant to be used directly. This patch replaces them with netif_tx_lock_bh. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-06-20 17:57:28 -07:00
..
acorn
acpi	Make sure to re-enable SCI after an ACPI suspend	2006-06-19 18:05:09 -07:00
amba
atm	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
base	[PATCH] revert "swsusp add check for suspension of X controlled devices"	2006-05-31 16:27:11 -07:00
block	[NET]: Clean up skb_linearize	2006-06-17 21:30:16 -07:00
bluetooth
cdrom	[PATCH] fix cdrom open	2006-06-17 10:44:26 -07:00
char	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2006-06-20 17:39:28 -07:00
connector	[CONNECTOR]: Initialize subsystem earlier.	2006-06-19 23:42:53 -07:00
cpufreq	[CPUFREQ] cpufreq core {d,}printk adjustments	2006-06-04 19:47:38 -04:00
crypto
dio
dma	[I/OAT]: Do not use for_each_cpu().	2006-06-17 21:25:58 -07:00
edac
eisa
fc4	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
firmware
hwmon
i2c	[PATCH] scx200_acb: fix section mismatch warning	2006-05-26 11:55:46 -07:00
ide	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
ieee1394	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2006-06-19 19:01:59 -07:00
input	Input: psmouse - DMI updates for lifebook protocol	2006-05-29 23:31:12 -04:00
isdn
leds	[ARM] 3563/1: LED: Set the LOCOMO LED driver default triggers	2006-06-19 13:08:39 +01:00
macintosh
mca
md	[PATCH] md: Fix badness in sysfs_notify caused by md_new_event	2006-05-31 16:27:11 -07:00
media	[NET]: Add netif_tx_lock	2006-06-17 21:30:14 -07:00
message	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
mfd
misc
mmc	[MMC] sdhci truncated pointer fix	2006-06-12 22:10:22 +01:00
mtd	[MTD] NAND: Fix breakage all over the place	2006-06-20 20:31:24 +01:00
net	[FORCEDETH] Fix xmit_lock/netif_tx_lock after merge	2006-06-20 17:57:28 -07:00
nubus
oprofile
parisc
parport	[SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI	2006-06-18 13:00:48 +01:00
pci	Merge branch 'master' into upstream	2006-06-13 20:29:04 -04:00
pcmcia	[ARM] Fix badge4 build error	2006-06-19 15:37:31 +01:00
pnp
rapidio
rtc	[PATCH] m48t86: ia64 build fix	2006-06-05 12:29:17 -07:00
s390	Merge git://git.infradead.org/hdrcleanup-2.6	2006-06-20 15:10:08 -07:00
sbus	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
scsi	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
serial	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2006-06-20 17:52:36 -07:00
sh
sn
spi	[PATCH] s3c24xx: fix spi driver with CONFIG_PM	2006-05-26 11:55:46 -07:00
tc
telephony
usb	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
video	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2006-06-20 14:49:00 -07:00
w1
zorro
Kconfig	[I/OAT]: DMA memcpy subsystem	2006-06-17 21:18:43 -07:00
Makefile	[I/OAT]: DMA memcpy subsystem	2006-06-17 21:18:43 -07:00