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
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
block	Driver core patches for 3.12-rc1	2013-09-03 11:37:15 -07:00
bluetooth
bus
cdrom
char	Merge branch 'ipmi'	2013-09-05 08:34:38 -07:00
clk
clocksource
connector
cpufreq	ACPI and power management updates for 3.12-rc1	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
dca
devfreq
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
eisa
extcon	Driver core patches for 3.12-rc1	2013-09-03 11:37:15 -07:00
firewire
firmware	Big part of this is the addition of compression to the	2013-09-03 21:14:06 -07:00
fmc
gpio
gpu	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-09-05 10:17:26 -07:00
hid	Driver core patches for 3.12-rc1	2013-09-03 11:37:15 -07:00
hsi
hv	Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely	2013-08-30 12:08:04 -07:00
hwmon	New driver for HTU21D (humidity sensor)	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	staging tree merge for 3.12-rc1	2013-09-03 11:37:57 -07:00
infiniband	Main batch of InfiniBand/RDMA changes for 3.12 merge window:	2013-09-05 09:39:27 -07:00
input	Driver core patches for 3.12-rc1	2013-09-03 11:37:15 -07:00
iommu
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
lguest
macintosh
mailbox
md	SCSI misc on 20130903	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
message
mfd	PCI changes for the v3.12 merge window:	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
mtd
net	net: stmmac: fix bad merge conflict resolution	2013-09-05 18:07:00 -07:00
nfc
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	PCI changes for the v3.12 merge window:	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
pinctrl	PTR_RET() is a weird name, and led to some confusing usage. We ended	2013-09-04 17:31:11 -07:00
platform	PTR_RET() is a weird name, and led to some confusing usage. We ended	2013-09-04 17:31:11 -07:00
pnp
power
pps
ps3
ptp
pwm	pwm: pxa: Use module_platform_driver	2013-09-03 13:09:17 +02:00
rapidio
regulator	PTR_RET() is a weird name, and led to some confusing usage. We ended	2013-09-04 17:31:11 -07:00
remoteproc
reset
rpmsg
rtc	PTR_RET() is a weird name, and led to some confusing usage. We ended	2013-09-04 17:31:11 -07:00
s390	SCSI misc on 20130903	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	PTR_RET() is a weird name, and led to some confusing usage. We ended	2013-09-04 17:31:11 -07:00
ssb
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
tty	TTY/Serial driver patches for 3.12-rc1	2013-09-03 11:38:36 -07:00
uio	Driver core patches for 3.12-rc1	2013-09-03 11:37:15 -07:00
usb	Driver core patches for 3.12-rc1	2013-09-03 11:37:15 -07:00
uwb
vfio
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
vlynq
vme
w1
watchdog
xen	Features:	2013-09-04 17:45:39 -07:00
zorro
Kconfig
Makefile