sugar/linux
1
0
Fork 0
Code Activity
Files
6523cf9a460c488c681b7e4ecef2395491de1d4e
linux/drivers
History
Kenth Eriksson 464b57da56 Fix non TBI PHY access; a bad merge undid bug fix in a previous commit. 
The merge done in commit b26e478f undid bug fix in commit c3e072f8
("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non
TBI (e.g. MDIO) PHYs cannot be accessed.

Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-01 16:47:12 -04:00
..
accessibility
…
acpi
…
amba
…
ata
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2012-03-22 20:22:30 -07:00
atm
…
auxdisplay
…
base
Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:41:37 -07:00
bcma
…
block
Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2012-03-24 12:20:25 -07:00
bluetooth
…
cdrom
…
char
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:03:32 -07:00
clk
…
clocksource
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
connector
…
cpufreq
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2012-03-23 17:56:39 -07:00
cpuidle
…
crypto
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-03-22 18:15:32 -07:00
dca
…
devfreq
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:03:32 -07:00
dio
…
dma
Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:24:31 -07:00
edac
Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:41:37 -07:00
eisa
…
firewire
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2012-03-22 20:31:15 -07:00
firmware
…
gpio
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:41:24 -07:00
gpu
Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:08:39 -07:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-03-23 14:39:09 -07:00
hv
…
hwmon
hwmon: Add MCP3021 ADC driver
2012-03-23 10:02:20 +01:00
hwspinlock
…
i2c
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
ide
…
idle
drivers/idle/intel_idle.c: fix confusing code identation
2012-03-21 17:54:54 -07:00
ieee802154
…
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-03-22 12:38:04 -07:00
input
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:27:28 -07:00
iommu
Merge tag 'iommu-updates-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-03-23 14:15:07 -07:00
isdn
mISDN: array underflow in open_bchannel()
2012-03-27 22:42:32 -04:00
leds
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:27:28 -07:00
lguest
…
macintosh
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6
2012-03-21 10:30:03 -07:00
mca
…
md
Merge tag 'md-3.4' of git://neil.brown.name/md
2012-03-22 12:29:50 -07:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-03-23 14:39:09 -07:00
memstick
…
message
…
mfd
Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:41:37 -07:00
misc
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
mmc
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:41:24 -07:00
mtd
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:27:28 -07:00
net
Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
2012-04-01 16:47:12 -04:00
nfc
…
nubus
…
of
Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm
2012-03-23 17:30:49 -07:00
oprofile
tidy up after d_make_root() conversion
2012-03-20 21:29:37 -04:00
parisc
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
parport
…
pci
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
pcmcia
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
pinctrl
…
platform
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
pnp
…
power
Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:41:37 -07:00
pps
…
ps3
…
ptp
…
rapidio
…
regulator
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:41:24 -07:00
remoteproc
…
rpmsg
…
rtc
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
s390
s390/char: use for_each_clear_bit()
2012-03-23 16:58:34 -07:00
sbus
…
scsi
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
sfi
…
sh
…
sn
…
spi
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:03:32 -07:00
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
staging
Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-03-24 10:24:31 -07:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-03-22 12:38:04 -07:00
tc
…
thermal
…
tty
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
uio
…
usb
f_phonet: fix skb truesize underestimation
2012-03-27 22:50:54 -04:00
uwb
uwb: use for_each_clear_bit()
2012-03-23 16:58:34 -07:00
vhost
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2012-03-23 14:46:48 -04:00
video
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:27:28 -07:00
virt
…
virtio
…
vlynq
…
w1
…
watchdog
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:47:35 -07:00
xen
Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2012-03-24 12:20:25 -07:00
zorro
…
Kconfig
Merge tag 'rpmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:30:09 -07:00
Makefile
Merge tag 'rpmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-03-27 16:30:09 -07:00