Linus Walleij 97ceed1fc2 ARM: 6829/1: amba: make hardcoded periphid override hardware ... This makes a hardcoded periphid from the platform override any magic number found in the hardware. This shall henceforth be used when the information found in the hardware is either missing, i.e. not encoding the CID with the magic cookie 0xb105f00d, or incorrect such that the revision number should have been bumped in hardware, but the silicon designer has failed to do so. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2011-05-26 10:33:34 +01:00
..
accessibility
acpi	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2011-05-25 16:52:50 -07:00
amba	ARM: 6829/1: amba: make hardcoded periphid override hardware	2011-05-26 10:33:34 +01:00
ata	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07: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	mm: per-node vmstat: show proper vmstats	2011-05-25 08:39:07 -07:00
bcma	bcma: add PCI ID of the card found in Thinkpad X120e	2011-05-16 14:25:29 -04:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2011-05-25 11:46:31 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
cdrom	Merge commit 'v2.6.39' into for-2.6.40/core	2011-05-20 20:33:15 +02:00
char	i8k: Integrate with the hwmon subsystem	2011-05-25 20:43:33 +02:00
clk
clocksource	Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-23 21:24:07 -07:00
connector
cpufreq	cpufreq: make DB8500 cpufreq driver compile	2011-05-24 22:20:14 +02:00
cpuidle
crypto	[S390] ap: skip device registration on type probe failure	2011-05-23 10:24:29 +02:00
dca
dio
dma	dmaengine: shdma: Update SH_DMAC_MAX_CHANNELS to 20	2011-05-25 11:36:17 +09:00
edac	x86: remove 32-bit versions of readq()/writeq()	2011-05-25 08:39:44 -07:00
eisa
firewire
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
gpio	drivers/gpio/ml_ioh_gpio.c needs slab.h	2011-05-25 08:39:57 -07:00
gpu	vmscan: change shrinker API by passing shrink_control struct	2011-05-25 08:39:26 -07:00
hid	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
hwmon	hwmon: New driver for the SMSC EMC6W201	2011-05-25 20:43:33 +02:00
hwspinlock
i2c	Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux	2011-05-24 16:39:23 -07:00
ide	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07:00
idle
ieee802154
infiniband	Add appropriate <linux/prefetch.h> include for prefetch users	2011-05-22 21:41:57 -07:00
input	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2011-05-25 15:35:32 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-25 17:00:17 -07:00
leds	leds: provide helper to register "leds-gpio" devices	2011-05-25 08:39:51 -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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
media	Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux	2011-05-24 15:35:54 +09: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	mach-ux500: voltage domain regulators for DB8500	2011-05-24 22:20:23 +02:00
misc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc	2011-05-25 16:55:55 -07:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-25 17:00:17 -07:00
nfc
nubus
of
oprofile
parisc
parport	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
pci	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-05-24 12:06:40 -07:00
pcmcia
platform	x86: remove 32-bit versions of readq()/writeq()	2011-05-25 08:39:44 -07:00
pnp
power
pps
ps3
ptp	ptp: Added a clock driver for the National Semiconductor PHYTER.	2011-05-23 13:10:23 -07:00
rapidio	rapidio: fix default routing initialization	2011-05-18 02:55:22 -07:00
regulator	mach-ux500: voltage domain regulators for DB8500	2011-05-24 22:20:23 +02:00
rtc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2011-05-25 15:35:32 -07:00
s390	[S390] get CPC image name	2011-05-23 10:24:32 +02:00
sbus
scsi	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07:00
sfi
sh	Merge branch 'sh/genirq-threading' into sh-latest	2011-05-23 11:36:14 +09:00
sn
spi	coldfire_qspi compile fix	2011-05-24 15:17:22 +10:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-25 17:00:17 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
tc
telephony
thermal
tty	drivers/tty/serial/pch_uart.c needs slab.h	2011-05-25 08:39:57 -07:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-05-24 13:28:35 -07:00
uwb
vhost
video	video: mb862xx: udelay need linux/delay.h	2011-05-25 19:04:15 -07:00
virtio
vlynq
w1
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -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 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-25 08:59:42 -07:00