shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-03 18:55:31 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
5ffd5cddd4d353fe18c01b89397dcad02035bb95
linux/drivers
History
Olof Johansson 356f9e74ff net: stmmac: fix bad merge conflict resolution 
Merge commit 06c54055be did a bad conflict resolution accidentally
leaving out a closing brace.  Add it back.

This breaks a handful of defconfigs on ARM, so it'd be good to see it
applied pretty quickly.

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-09-05 18:07:00 -07:00
..
accessibility
printk: move braille console support into separate braille.[ch] files
2013-07-31 14:41:03 -07:00
acpi
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-09-05 09:31:03 -07:00
amba
…
ata
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2013-09-03 18:19:53 -07:00
atm
atm: he: print MAC via %pM
2013-09-04 14:41:55 -04:00
auxdisplay
…
base
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-09-04 18:15:06 -07:00
bcma
bcma: add bcma_core_pci_power_save()
2013-08-26 14:09:03 -04:00
block
Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-09-03 11:37:15 -07:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2013-08-22 14:27:31 -04:00
bus
drivers/bus: arm-cci: avoid parsing DT for cpu device nodes
2013-08-21 10:29:53 +01:00
cdrom
drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
2013-07-03 16:07:25 -07:00
char
Merge branch 'ipmi'
2013-09-05 08:34:38 -07:00
clk
clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
2013-08-13 10:01:56 -07:00
clocksource
Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core
2013-08-21 14:59:23 +02:00
connector
…
cpufreq
Merge tag 'pm+acpi-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2013-09-03 15:59:39 -07:00
cpuidle
cpuidle: coupled: fix race condition between pokes and safe state
2013-08-29 22:15:34 +02:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-07-24 11:05:18 -07:00
dca
…
devfreq
devfreq: convert devfreq_class to use dev_groups
2013-08-19 21:22:34 -07:00
dio
…
dma
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-09-05 08:50:26 -07:00
edac
amd64_edac: Fix incorrect wraparounds
2013-08-27 15:00:22 +02:00
eisa
…
extcon
Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-09-03 11:37:15 -07:00
firewire
firewire: fix libdc1394/FlyCap2 iso event regression
2013-07-27 20:24:36 +02:00
firmware
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
2013-09-03 21:14:06 -07:00
fmc
FMC: Staticize local symbols
2013-08-12 15:45:40 -07:00
gpio
gpio_msm: Fix build error due to missing err.h
2013-07-31 00:34:31 +02:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-09-05 10:17:26 -07:00
hid
Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-09-03 11:37:15 -07:00
hsi
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
hv
Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely
2013-08-30 12:08:04 -07:00
hwmon
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
2013-09-03 10:43:35 -07:00
hwspinlock
…
i2c
i2c: rcar: add rcar-H2 support
2013-09-04 11:49:16 +01:00
ide
ide: sgiioc4: Staticize ioc4_ide_attach_one()
2013-09-05 15:21:30 -04:00
idle
…
iio
Merge tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2013-09-03 11:37:57 -07:00
infiniband
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2013-09-05 09:39:27 -07:00
input
Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-09-03 11:37:15 -07:00
iommu
Merge tag 'iommu-updates-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2013-07-10 14:46:40 -07:00
ipack
…
irqchip
irqchip: sirf: move from legacy mode to linear irqdomain
2013-08-29 09:48:32 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
leds
leds: convert class code to use dev_groups
2013-07-26 18:05:17 -07:00
lguest
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
macintosh
powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
2013-08-01 13:11:47 +10:00
mailbox
…
md
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2013-09-03 15:48:06 -07:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-09-05 11:55:59 -07:00
memory
…
memstick
drivers/memstick/host/r592.c: convert to module_pci_driver
2013-07-03 16:08:06 -07:00
message
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
mfd
Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2013-09-03 16:24:35 -07:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-09-05 08:50:26 -07:00
mmc
mmc: pxamci: Indicate that regulators may be absent
2013-07-31 09:56:41 +01:00
mtd
Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi
2013-07-05 12:09:48 -07:00
net
net: stmmac: fix bad merge conflict resolution
2013-09-05 18:07:00 -07:00
nfc
NFC: pn544: i2c: Add firmware download implementation for pn544
2013-08-14 01:13:35 +02:00
ntb
…
nubus
…
of
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-09-05 09:31:03 -07:00
oprofile
oprofile: get rid of pointless forward declarations of struct super_block
2013-09-03 22:52:48 -04:00
parisc
Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2013-09-03 16:24:35 -07:00
parport
drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
2013-08-30 12:08:04 -07:00
pci
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
pcmcia
PCI: Delay enabling bridges until they're needed
2013-07-25 12:35:03 -06:00
pinctrl
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-09-04 17:31:11 -07:00
platform
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-09-04 17:31:11 -07:00
pnp
Merge branch 'pnp'
2013-08-27 01:41:35 +02:00
power
Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6
2013-07-10 11:13:00 -07:00
pps
PPS: convert class code to use dev_groups
2013-08-19 21:22:34 -07:00
ps3
…
ptp
PTP: convert class code to use dev_groups
2013-07-26 18:05:17 -07:00
pwm
pwm: pxa: Use module_platform_driver
2013-09-03 13:09:17 +02:00
rapidio
rapidio: fix use after free in rio_unregister_scan()
2013-07-31 14:41:02 -07:00
regulator
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-09-04 17:31:11 -07:00
remoteproc
remoteproc: don't use PTR_RET().
2013-07-15 11:25:04 +09:30
reset
…
rpmsg
…
rtc
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-09-04 17:31:11 -07:00
s390
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2013-09-03 15:48:06 -07:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2013-09-05 15:28:17 -07:00
sfi
…
sh
…
sn
…
spi
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-09-04 17:31:11 -07:00
ssb
ssb: drop BROKEN from SSB_SFLASH
2013-08-01 15:49:33 -04:00
staging
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
target
target: Fix se_cmd->state_list leak regression during WRITE failure
2013-08-31 15:19:12 -07:00
tc
…
thermal
Thermal: Fix lockup of cpu_down()
2013-07-22 09:34:46 +08:00
tty
Merge tag 'tty-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2013-09-03 11:38:36 -07:00
uio
Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-09-03 11:37:15 -07:00
usb
Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2013-09-03 11:37:15 -07:00
uwb
uwb: Staticize local symbols
2013-08-19 17:08:16 -07:00
vfio
vfio-pci: Avoid deadlock on remove
2013-07-24 16:36:41 -06:00
vhost
vhost_net: correctly limit the max pending buffers
2013-09-03 22:46:58 -04:00
video
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-09-05 10:17:26 -07:00
virt
…
virtio
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-07-10 14:50:58 -07:00
vlynq
…
vme
vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq()
2013-08-27 21:49:26 -07:00
w1
w1: slaves: w1_ds2781: convert to use w1_family_ops.groups
2013-08-22 11:05:44 -07:00
watchdog
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-07-13 14:52:21 -07:00
xen
Merge tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2013-09-04 17:45:39 -07:00
zorro
…
Kconfig
Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next
2013-07-10 11:10:27 -07:00
Makefile
Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next
2013-07-10 11:10:27 -07:00