Lendacky, Thomas d5c4858237 amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict ... MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc architecture. Rename this #define in xgbe.h to avoid the redefined warning issued during compilation. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-11 00:56:41 -07:00
..
accessibility
acpi	ACPI / thermal: fix workqueue destroy order	2014-05-26 14:34:07 +02:00
amba	ARM: SoC: driver changes	2014-04-05 15:37:40 -07:00
ata	libata: Blacklist queued trim for Crucial M500	2014-06-02 16:59:25 -07:00
atm	atm: fore200e.c: Cleaning up uninitialized variables	2014-06-02 17:11:03 -07:00
auxdisplay
base	drivercore: deferral race condition fix	2014-04-29 15:44:05 +01:00
bcma	bcma: gpio: register 32 GPIOs on BCM5357	2014-03-27 14:20:04 -04:00
block	virtio_blk: fix race between start and stop queue	2014-05-27 08:41:10 -06:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2014-06-05 14:10:07 -04:00
bus	bus: mvebu-mbus: allow several windows with the same target/attribute	2014-04-24 03:48:08 +00:00
cdrom
char	This fixes a BUG_ON-causing regression that was introduced during the	2014-05-21 18:56:35 +09:00
clk	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
clocksource	clocksource: tcb_clksrc: Make tc_mode interrupt safe	2014-05-22 18:54:58 +02:00
connector	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
cpufreq	Merge branches 'pm-cpufreq' and 'acpi-thermal'	2014-05-26 23:20:16 +02:00
cpuidle	Merge branch 'pm-cpuidle'	2014-04-08 13:27:40 +02:00
crypto	crypto: caam - add allocation failure handling in SPRINTFCAT macro	2014-04-28 18:17:18 +08:00
dca
devfreq	PM / devfreq: Rewrite devfreq_update_status() to fix multiple bugs	2014-03-21 11:16:30 +09:00
dio
dma	Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma	2014-05-27 13:57:00 -07:00
edac	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-04-04 09:50:07 -07:00
eisa
extcon	extcon: Move OF helper function to extcon core and change function name	2014-03-19 14:41:58 +09:00
firewire	firewire: revert to 4 GB RDMA, fix protocols using Memory Space	2014-05-29 15:50:30 +02:00
firmware	iscsi_ibft: Fix finding Broadcom specific ibft sign	2014-05-13 14:54:14 -04:00
fmc
gpio	gpio: mcp23s08: Bug fix of SPI device tree registration.	2014-05-09 10:28:16 +02:00
gpu	drm/radeon: Resume fbcon last	2014-05-31 09:19:51 +10:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2014-05-07 16:07:58 -07:00
hsi
hv	hyper-v: make uuid_le const	2014-06-03 18:18:38 -07:00
hwmon	hwmon: (ntc_thermistor) Fix OF device ID mapping	2014-05-25 17:23:08 +02:00
hwspinlock
i2c	i2c: rcar: bail out on zero length transfers	2014-05-14 18:59:57 +02:00
ide
idle	intel_idle: fix IVT idle state table setting	2014-04-21 23:36:07 +02:00
iio	iio: adc: Nothing in ADC should be a bool CONFIG	2014-04-26 11:22:16 +01:00
infiniband	iw_cxgb4: don't truncate the recv window size	2014-06-10 22:49:54 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2014-05-30 12:07:48 -07:00
iommu	iommu/amd: fix enabling exclusion range for an exact device	2014-05-13 12:33:12 +02:00
ipack
irqchip	mvebu irqchip ifxes for v3.15	2014-04-29 19:23:22 +02:00
isdn	isdn/capi: fix (middleware) device nodes	2014-06-04 23:13:41 -07:00
leds	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds	2014-04-10 09:06:10 -07:00
lguest	drivers/lguest/page_tables.c: rename do_set_pte()	2014-04-07 16:35:52 -07:00
macintosh
mailbox
mcb	drivers: mcb: fix memory leak in chameleon_parse_cells() error path	2014-04-16 12:28:47 -07:00
md	Two md bugfixes for possible corruption when restarting reshape	2014-06-02 17:04:37 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-05-21 19:01:08 +09:00
memory	memory: mvebu-devbus: fix the conversion of the bus width	2014-04-17 04:14:30 +00:00
memstick
message	PCI changes for the v3.15 merge window:	2014-04-01 15:14:04 -07:00
mfd	mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"	2014-05-08 08:44:50 +01:00
misc	misc: Grammar s/addition/additional/	2014-04-16 12:28:47 -07:00
mmc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-05-27 13:51:31 -04:00
mtd	MTD update for 3.15-rc5	2014-05-07 16:28:52 -07:00
net	amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict	2014-06-11 00:56:41 -07:00
nfc	NFC: trf7970a: Add support for Felica Type 3 tags	2014-05-26 01:28:28 +02:00
ntb	ntb: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-04-07 10:59:20 -07:00
nubus
of	of: of_mdio: export symbol of_mdiobus_link_phydev	2014-06-02 10:43:07 -07:00
oprofile	oprofile, nmi-timer: Fix CPU hotplug callback registration	2014-03-20 13:43:46 +01:00
parisc
parport
pci	PCI updates for v3.15:	2014-05-21 18:57:25 +09:00
pcmcia	PCI changes for the v3.15 merge window:	2014-04-01 15:14:04 -07:00
phy	phy: fix kernel oops in phy_lookup()	2014-04-24 12:53:38 -07:00
pinctrl	pinctrl: vt8500: Ensure value reg is updated when setting direction	2014-05-22 23:46:10 +02:00
platform	alienware-wmi: cover some scenarios where memory allocations would fail	2014-04-10 12:11:56 -04:00
pnp	asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*	2014-05-05 16:07:46 -07:00
power	power/reset: vexpress: Fix restart/power off operation	2014-04-24 17:20:50 +01:00
powercap	CPU hotplug notifiers registration fixes for 3.15-rc1	2014-04-07 14:55:46 -07:00
pps
ps3
ptp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
pwm	Shiraz has moved	2014-04-18 16:40:08 -07:00
rapidio	rapidio: rework device hierarchy and introduce mport class of devices	2014-04-07 16:36:07 -07:00
regulator	regulator: pbias: Convert to use regmap helper functions	2014-04-14 22:16:25 +01:00
remoteproc
reset	Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers	2014-03-27 01:28:19 +01:00
rpmsg
rtc	drivers/rtc/rtc-hym8563.c: set uie_unsupported	2014-05-11 17:55:48 +09:00
s390	net: use ethtool_cmd_speed_set helper to set ethtool speed value	2014-06-06 16:24:07 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
sfi
sh	drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI	2014-05-12 16:05:01 +09:00
sn
spi	Merge remote-tracking branches 'spi/fix/pxa2xx' and 'spi/fix/qup' into spi-linus	2014-05-13 19:08:34 +01:00
spmi
ssb
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
target	target: fix memory leak on XCOPY	2014-05-17 15:49:40 -07:00
tc
thermal	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2014-04-10 09:15:46 -07:00
tty	Staging: speakup: Update __speakup_paste_selection() tty (ab)usage to match vt	2014-05-24 02:25:11 +09:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
uwb	uwb: don't call spin_unlock_irq in a USB completion handler	2014-04-24 12:45:40 -07:00
vfio	VFIO updates for v3.15 include:	2014-04-03 14:05:02 -07:00
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-04-12 16:51:08 -07:00
video	video: Kconfig: move drm and fb into separate menus	2014-04-17 08:10:20 +03:00
virt
virtio
vlynq
vme	vme_tsi148: Utilize to_pci_dev() macro	2014-04-16 14:08:37 -07:00
w1	w1: avoid recursive device_add	2014-04-16 14:07:51 -07:00
watchdog	CPU hotplug notifiers registration fixes for 3.15-rc1	2014-04-07 14:55:46 -07:00
xen	Xen bug fixes for 3.15-rc5	2014-05-13 11:21:01 +09:00
zorro
Kconfig
Makefile	SH Driver Update for v3.15	2014-05-22 04:26:23 +09:00