Nick Bowler 05ad62a5ee Staging: et131x: Properly disable FC in txmac. ... FC disable is bit 3 of the txmac ctl register, but commit 6720949d55 ("Staging: et131x: Kil the txmac type") accidentally changed the code to set bit 2 instead. Signed-off-by: Nick Bowler <nbowler@draconx.ca> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2010-03-29 08:51:36 -07:00
..
accessibility
acpi	acpi: Support IBM SMBus CMI devices	2010-03-24 14:38:37 +01:00
amba
ata	libata-sff: fix spurious IRQ handling	2010-03-23 09:39:08 -04:00
atm	atm: use for_each_set_bit()	2010-03-15 16:00:47 -07:00
auxdisplay
base	power: support _noirq actions on device types and classes	2010-03-24 11:00:02 +01:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
bluetooth
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2010-03-24 16:42:43 -07:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
edac	edac, mce: Filter out invalid values	2010-03-22 16:33:31 +01:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-03-26 15:07:46 -07:00
firmware
gpio	drivers/gpio/max730x.c: add license macro	2010-03-24 16:31:20 -07:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-03-26 16:34:29 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2010-03-18 16:52:31 -07:00
hwmon
i2c	i2c-scmi: Provide module aliases for automatic loading	2010-03-24 14:38:39 +01:00
ide
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
ieee802154
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2010-03-19 13:39:42 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-14 11:13:54 -07:00
isdn	isdn: Cleanup Sections in PCMCIA driver elsa	2010-03-25 11:58:02 -07:00
leds	leds: Fix race between LED device uevent and actual attributes creation	2010-03-16 20:27:25 +00:00
lguest
macintosh	backlight: Allow properties to be passed at registration	2010-03-16 19:47:54 +00:00
mca
md	Merge branch 'for-linus' of git://neil.brown.name/md	2010-03-18 16:55:24 -07:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-14 11:13:54 -07:00
memstick
message
mfd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6	2010-03-12 16:41:09 -08:00
misc	c2port: fix device_create() return value check	2010-03-24 16:31:21 -07:00
mmc	mmc: fix incorrect interpretation of card type bits	2010-03-24 16:31:21 -07:00
mtd	Delete zero-length file drivers/mtd/maps/omap_nor.c	2010-03-19 14:25:45 -04:00
net	via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()	2010-03-25 11:56:32 -07:00
nubus
of
oprofile
parisc
parport
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-03-26 16:34:29 -07:00
pcmcia	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-03-26 16:34:29 -07:00
platform	backlight: panasonic-laptop - Fix incomplete registration failure handling	2010-03-16 20:13:31 +00:00
pnp	PNPACPI: add bus number support	2010-03-14 20:08:38 -04:00
power	Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release	2010-03-14 21:30:17 -04:00
pps	pps: serial clients support	2010-03-12 15:52:43 -08:00
ps3
rapidio
regulator	regulator: fix dangling pointers	2010-03-22 19:46:16 +00:00
rtc	rtc/mc13783: fix use after free bug	2010-03-24 16:31:19 -07:00
s390	[S390] fix broken proc interface for sclp_async	2010-03-24 11:49:53 +01:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-03-18 16:54:31 -07:00
serial	SH: remove superfluous warning from the serial driver	2010-03-23 13:33:51 +09:00
sfi
sh	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-03-19 18:16:20 -07:00
sn
spi	Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6	2010-03-18 17:01:19 -07:00
ssb
staging	Staging: et131x: Properly disable FC in txmac.	2010-03-29 08:51:36 -07:00
tc
telephony
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-03-19 13:40:03 -07:00
uwb	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb	2010-03-19 18:14:22 -07:00
vhost	vhost: fix error handling in vring ioctls	2010-03-17 23:07:35 +02:00
video	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-03-24 16:52:15 -07:00
virtio
vlynq
w1	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
watchdog
xen
zorro
Kconfig
Makefile