Grant Likely 5d10302f46 dt: remove extra xsysace platform_driver registration ... After commit 1c48a5c93, "dt: Eliminate of_platform_{,un}register_driver", the xsysace driver attempts to register two platform_drivers with the same name, which a) doesn't work, and b) isn't necessary. This patch merges the two platform_drivers. Reported-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2011-07-14 05:33:52 -06:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-05-29 11:19:16 -07:00
amba	ARM: 6829/1: amba: make hardcoded periphid override hardware	2011-05-26 10:33:34 +01:00
ata	libata: fix unexpectedly frozen port after ata_eh_reset()	2011-06-07 15:55:55 -04:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
auxdisplay
base	PM / Runtime: Fix loops in pm_runtime_clk_notify()	2011-06-07 23:34:58 +02:00
bcma	drivers/bcma/host_pci.c needs slab.h	2011-05-26 17:12:32 -07:00
block	dt: remove extra xsysace platform_driver registration	2011-07-14 05:33:52 -06:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem	2011-06-17 12:40:36 -04:00
cdrom	block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal	2011-06-02 05:29:19 +09:00
char	drivers/char/hpet.c: fix periodic-emulation for delayed interrupts	2011-06-15 20:04:02 -07:00
clk
clocksource	Revert "clocksource: sh_cmt: Runtime PM support"	2011-05-31 15:26:42 +09:00
connector
cpufreq	[CPUFREQ] powernow-k8: Don't try to transition if the pstate is incorrect	2011-06-16 16:31:13 -04:00
cpuidle	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2011-05-29 11:18:09 -07:00
crypto	[S390] ap: skip device registration on type probe failure	2011-05-23 10:24:29 +02:00
dca
dio
dma	dmaengine: shdma: SH_DMAC_MAX_CHANNELS message fix	2011-06-14 15:03:07 +09:00
edac	edac,rcu: use synchronize_rcu() instead of call_rcu()+rcu_barrier()	2011-05-26 17:12:37 -07:00
eisa
firewire
firmware	iscsi_ibft: iscsi_ibft_find unused variable i	2011-06-09 09:05:12 -04:00
gpio	gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.	2011-06-16 08:40:43 -06:00
gpu	drm/radeon/kms/r6xx+: voltage fixes	2011-06-21 09:38:25 +10:00
hid	Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"	2011-06-16 12:21:34 +02:00
hwmon	hwmon: (s3c) Initialize sysfs attributes	2011-06-17 23:22:27 -07:00
hwspinlock
i2c	mfd: Use mfd cell platform_data for timberdale cells platform bits	2011-05-26 19:45:05 +02:00
ide	ide-cd: signedness warning fix again	2011-06-11 15:06:48 -07:00
idle
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-05-26 12:13:57 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-06-20 08:59:46 -07:00
isdn	gigaset: call module_put before restart of if_open()	2011-06-17 15:27:32 -04:00
leds	leds: fix the incorrect display in menuconfig	2011-06-15 20:04:01 -07:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mca
md	md/raid5: remove unusual use of bio_iovec_idx()	2011-06-14 14:23:57 +10:00
media	Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-06-09 13:09:07 -07:00
memstick
message	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mfd	mfd: Fix build breakage caused by tps65910 gpio directory move	2011-05-28 08:38:55 +02:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-06-20 20:10:18 -07:00
mmc	Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-06-15 22:01:36 -07:00
mtd	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
net	pxa168_eth: fix race in transmit path.	2011-06-20 14:02:07 -07:00
nfc
nubus
of	dt: add helper function to read u32 arrays	2011-07-06 14:58:09 -06:00
oprofile	oprofile: Fix locking dependency in sync_start()	2011-05-31 16:33:34 +02:00
parisc
parport	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-05-26 13:19:00 -07:00
pci	Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-06-14 11:25:32 -07:00
pcmcia	gpio: include linux/gpio.h where needed	2011-06-16 08:40:44 -06:00
platform	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86	2011-05-29 11:44:33 -07:00
pnp
power	Merge git://git.infradead.org/battery-2.6	2011-05-27 10:12:35 -07:00
pps
ps3
ptp	ptp: Fix some locking bugs in ptp_read()	2011-06-01 19:29:10 -07:00
rapidio
regulator	regulator: Fix _regulator_get_voltage if get_voltage callback is NULL	2011-05-27 10:49:30 +01:00
rtc	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-06-13 10:47:04 -07:00
s390	[S390] qdio: Split SBAL entry flags	2011-06-06 14:14:56 +02:00
sbus
scsi	[SCSI] Fix oops caused by queue refcounting failure	2011-06-02 18:34:43 +09:00
sfi
sh	drivers: sh: resume enabled clocks fix	2011-06-14 15:15:25 +09:00
sn
spi	spi/bfin_spi: fix handling of default bits per word setting	2011-06-17 08:27:27 -06:00
ssb	ssb: fix PCI(e) driver regression causing oops on PCI cards	2011-06-03 14:19:49 -04:00
staging	staging: fix iio builds when IIO_RING_BUFFER is not enabled	2011-06-16 08:29:00 -07:00
target	[SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions	2011-05-24 13:03:56 -04:00
tc
telephony
thermal
tty	tty/serial: Add devicetree support for nVidia Tegra serial ports	2011-07-10 06:37:43 +09:00
uio
usb	USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver	2011-06-08 13:48:30 -07:00
uwb
vhost	vhost: support event index	2011-05-30 11:14:15 +09:30
video	Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x	2011-06-16 09:45:47 -07:00
virtio	virtio: add api for delayed callbacks	2011-05-30 11:14:16 +09:30
vlynq
w1	w1: W1_MASTER_DS1WM should depend on GENERIC_HARDIRQS	2011-06-15 20:04:00 -07:00
watchdog	mfd: Use mfd cell platform_data for rdc321x cells platform bits	2011-05-26 19:45:06 +02:00
xen	Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-06-20 09:01:33 -07:00
zorro
Kconfig	ptp: Added a brand new class driver for ptp clocks.	2011-05-23 13:01:00 -07:00
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2011-05-28 12:35:15 -07:00