Jiri Kosina 3ae821effd HID: sony: fix force feedback mismerge ... Fix unfortunate mismerge between the fixes and sony branch causing code duplication and unterminated basic block. Signed-off-by: Jiri Kosina <jkosina@suse.cz>		2014-04-01 19:11:09 +02:00
..
accessibility
acpi	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
amba
ata	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
atm
auxdisplay
base	Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"	2014-01-13 14:05:13 -08:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2014-01-20 09:24:31 -08:00
bluetooth
bus
cdrom
char	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
clk	Merge branch 'for-next' into for-linus	2014-01-20 10:20:14 +01:00
clocksource	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 11:34:26 -08:00
connector
cpufreq	intel_pstate: Add X86_FEATURE_APERFMPERF to cpu match parameters.	2014-01-06 22:16:14 +01:00
cpuidle
crypto
dca
devfreq
dio
dma	Merge branch 'for-next' into for-linus	2014-01-20 10:20:14 +01:00
edac	Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 12:10:27 -08:00
eisa	Revert "EISA: Initialize device before its resources"	2014-01-17 14:57:29 -07:00
extcon	extcon: gpio: Add power resume support	2014-01-09 09:53:30 +09:00
firewire
firmware	drivers/firmware/memmap.c: use memblock apis for early memory allocations	2014-01-21 16:19:47 -08:00
fmc
gpio	MFD changes due for the v3.14 merge window	2014-01-21 10:58:17 -08:00
gpu	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
hid	HID: sony: fix force feedback mismerge	2014-04-01 19:11:09 +02:00
hsi
hv
hwmon	hwmon: (k10temp) Add support for Kaveri CPUs	2014-01-14 21:36:54 -08:00
hwspinlock
i2c	i2c: s3c2410: fix quirk usage for 64-bit	2014-01-16 11:18:24 +01:00
ide
idle	Merge branch 'x86/idle' into sched/core	2014-01-13 17:37:05 +01:00
iio	iio: hid-sensor-hub: Remove hard coded indexes	2014-02-17 15:09:47 +01:00
infiniband	infiniband: make sure the src net is infiniband when create new link	2014-01-03 20:38:56 -05:00
input	MFD changes due for the v3.14 merge window	2014-01-21 10:58:17 -08:00
iommu	intel-iommu: fix off-by-one in pagetable freeing	2014-01-21 16:19:41 -08:00
ipack
irqchip
isdn	isdn: Drop big endian cpp checks from telespci and hfc_pci drivers	2014-01-06 15:50:51 -05:00
leds	GPIO tree bulk changes for v3.14	2014-01-21 10:09:12 -08:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2014-01-20 09:24:31 -08:00
mailbox
md	A set of device-mapper changes for 3.14.	2014-01-22 20:17:48 -08:00
media
memory
memstick
message	MPT / PCI: Use pci_stop_and_remove_bus_device_locked()	2014-01-14 12:14:25 -07:00
mfd	MFD changes due for the v3.14 merge window	2014-01-21 10:58:17 -08:00
misc	Driver core / sysfs patches for 3.14-rc1	2014-01-20 15:49:44 -08:00
mmc	ARM: s3c24xx: explicit dependency on <plat/gpio-cfg.h>	2014-01-14 15:24:54 +01:00
mtd	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-01-06 12:20:45 +11:00
net	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 10:25:12 -08:00
nfc
ntb
nubus
of
oprofile
parisc
parport	TTY/Serial driver patches for 3.14-rc1	2014-01-20 16:05:23 -08:00
pci	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
pcmcia	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
phy	USB patches for 3.14-rc1	2014-01-20 16:13:02 -08:00
pinctrl	MFD changes due for the v3.14 merge window	2014-01-21 10:58:17 -08:00
platform	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
pnp
power
powercap
pps
ps3
ptp
pwm	pwm: Add LP3943 PWM driver	2014-01-21 08:28:00 +00:00
rapidio
regulator	mfd: mc13xxx: Remove useless symbol MFD_MC13783	2014-01-21 08:28:09 +00:00
remoteproc
reset
rpmsg
rtc	Merge branch 'fortglx/3.14/time' of git://git.linaro.org/people/john.stultz/linux into timers/core	2014-01-12 14:13:31 +01:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-01-20 09:23:31 -08:00
sbus
scsi	SCSI for-linus on 20140122	2014-01-22 17:32:26 -08:00
sfi
sh
sn
spi
ssb
staging	USB patches for 3.14-rc1	2014-01-20 16:13:02 -08:00
target
tc
thermal	sched, thermal: Clean up preempt_enable_no_resched() abuse	2014-01-13 17:39:18 +01:00
tty	tty/serial: at91: disable uart timer at start of shutdown	2014-01-13 15:55:59 -08:00
uio
usb	USB patches for 3.14-rc1	2014-01-20 16:13:02 -08:00
uwb
vfio	vfio-pci: Use pci "try" reset interface	2014-01-15 10:43:17 -07:00
vhost
video	PCI changes for the v3.14 merge window:	2014-01-22 16:39:28 -08:00
virt
virtio
vlynq
vme
w1
watchdog	Watchdog: pcwd_usb: remove CONFIG_USB_DEBUG usage	2014-01-07 16:15:39 -08:00
xen
zorro
Kconfig
Makefile