Oliver Hartkopp 4be0015c95 can: peak_pci: add PCI ID definition pcie card variant ... Add PCI ID definition for the single channel PCAN ExpressCard 34 adapter. Due to the subsystem id evaluation the correct number of channels (here 1) is created at initialization time. Tested including the LED functionality. Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Acked-by: Stephane Grosjean <s.grosjean@peak-system.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>		2014-09-18 11:15:09 +02:00
..
accessibility
acpi	Merge branches 'acpi-video' and 'acpi-ec'	2014-09-05 15:29:12 +02:00
amba
ata	ahci_xgene: Fix the link down in first attempt for the APM X-Gene SoC AHCI SATA host controller driver.	2014-09-06 11:27:15 +09:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-13 18:27:40 -06:00
auxdisplay
base	Merge remote-tracking branches 'regmap/fix/cache', 'regmap/fix/debugfs' and 'regmap/fix/volatile' into regmap-linus	2014-08-31 13:23:45 +01:00
bcma	bcma: add PCI ID for spromless BCM43217	2014-08-25 15:39:23 -04:00
block	Merge branch 'akpm' (fixes from Andrew Morton)	2014-08-29 16:28:29 -07:00
bluetooth
bus	bus: arm-ccn: Move event cleanup routine	2014-09-05 13:25:01 -07:00
cdrom
char	virtio: rng: add derating factor for use by hwrng core	2014-08-15 10:26:01 +05:30
clk	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
clocksource	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
connector
cpufreq	cpufreq: intel_pstate: Remove unneeded variable	2014-09-03 01:31:04 +02:00
cpuidle	ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number	2014-08-27 15:40:45 +01:00
crypto	PCI changes for the v3.17 merge window (part 2):	2014-08-14 18:10:33 -06:00
dca
devfreq
dio
dma	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-08-11 07:14:01 -07:00
dma-buf	dma-buf/fence: Fix a kerneldoc warning	2014-08-28 11:59:09 +05:30
edac	Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac	2014-08-15 17:56:45 -06:00
eisa
extcon
firewire
firmware	firmware: Do not use WARN_ON(!spin_is_locked())	2014-08-22 08:45:40 +01:00
fmc
gpio	gpio: bt8xx: fix release of managed resources	2014-08-29 14:31:43 +02:00
gpu	Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes	2014-09-05 09:27:33 +10:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2014-08-27 09:38:06 -07:00
hsi
hv
hwmon	hwmon: (ds1621) Update zbits after conversion rate change	2014-08-28 11:18:47 -07:00
hwspinlock
i2c	Revert "i2c: rcar: remove spinlock"	2014-09-04 19:59:42 +02:00
ide
idle	intel_idle: Broadwell support	2014-08-15 17:06:40 -04:00
iio
infiniband	mlx4: Fix wrong endianess access with QP context flags	2014-09-10 15:22:43 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2014-09-03 17:26:12 -07:00
iommu	iommu/core: Check for the right function pointer in iommu_map()	2014-08-19 00:19:26 +02:00
ipack
irqchip	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
isdn	drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef	2014-08-22 11:31:30 -07:00
leds	Revert "leds: convert blink timer to workqueue"	2014-09-02 10:02:13 -07:00
lguest
macintosh
mailbox
mcb
md	dm crypt: fix access beyond the end of allocated space	2014-08-28 14:24:09 -04:00
media	media: use pci_zalloc_consistent	2014-08-08 15:57:28 -07:00
memory
memstick
message	scsi: use 'depends' instead of 'select' for SCSI_FC_ATTRS	2014-09-16 16:55:55 -04:00
mfd	mfd: twl4030-power: Fix PM idle pin configuration to not conflict with regulators	2014-08-28 15:57:55 +01:00
misc	mei: nfc: fix memory leak in error path	2014-08-25 13:16:23 -07:00
mmc	PCI changes for the v3.17 merge window (part 2):	2014-08-14 18:10:33 -06:00
mtd	Two trivial MTD updates for 3.17-rc4:	2014-09-06 12:12:09 -07:00
net	can: peak_pci: add PCI ID definition pcie card variant	2014-09-18 11:15:09 +02:00
nfc
ntb
nubus
of	of/irq: Fix lookup to use 'interrupts-extended' property first	2014-08-16 09:03:58 +01:00
oprofile
parisc
parport	drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO	2014-08-08 15:57:25 -07:00
pci	PCI update for v3.17:	2014-09-03 08:45:48 -07:00
pcmcia
phy	ARM: SoC driver changes for 3.17	2014-08-08 11:34:32 -07:00
pinctrl	pinctrl: exynos: Lock GPIOs as interrupts when used as EINTs	2014-08-21 07:24:29 -05:00
platform	toshiba_acpi: fix and cleanup toshiba_kbd_bl_mode_store()	2014-09-03 10:45:12 -07:00
pnp
power	ARM: SoC platform changes for 3.17	2014-08-08 11:14:29 -07:00
powercap	powercap / RAPL: change domain detection message	2014-09-03 01:29:00 +02:00
pps
ps3
ptp	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
pwm	pwm: Fix period and polarity in pwm_get() for non-perfect matches	2014-08-18 10:58:43 +02:00
rapidio	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
ras
regulator
remoteproc
reset
rpmsg
rtc	drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified	2014-08-29 16:28:16 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-09-08 08:27:00 -07:00
sbus
scsi	scsi: use 'depends' instead of 'select' for SCSI_FC_ATTRS	2014-09-16 16:55:55 -04:00
sfi
sh	sh: intc: Confine SH_INTC to platforms that need it	2014-08-22 12:28:16 +09:00
sn
soc
spi	Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linus	2014-08-31 13:46:19 +01:00
spmi
ssb	ssb: add PCI ID 0x4351	2014-08-25 15:39:22 -04:00
staging	USB fixes for 3.17-rc3	2014-08-29 12:10:03 -07:00
target
tc
thermal
thunderbolt	thunderbolt: Clear hops before overwriting	2014-08-26 14:54:48 -07:00
tty	The branch contains the following device tree changes the v3.17 merge	2014-08-14 09:53:39 -06:00
uio
usb	USB: fix build error with CONFIG_PM_RUNTIME disabled	2014-08-27 16:55:29 -07:00
uwb
vfio
vhost
video	fbdev fixes for 3.17	2014-08-29 11:59:46 -07:00
virt
virtio
vlynq
vme	vme: bridges: use pci_zalloc_consistent	2014-08-08 15:57:30 -07:00
w1
watchdog
xen	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
zorro
Kconfig
Makefile