Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 ... Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c		2010-08-16 18:42:58 +01:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-08-15 17:37:07 -07:00
amba
ata	Merge branch 'linus' into release	2010-08-15 01:06:31 -04:00
atm	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
auxdisplay
base
block	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
bluetooth
cdrom
char	Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2010-08-12 10:01:59 -07:00
clocksource
connector
cpufreq
cpuidle
crypto	[S390] zcrypt: fix Kconfig dependencies	2010-08-13 10:06:54 +02:00
dca
dio
dma	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
edac	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
eisa
firewire
firmware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-14 12:34:34 -07:00
gpio	gpiolib: Implement set_debounce for WM831x GPIOs	2010-08-12 11:27:57 +02:00
gpu	Merge git://git.infradead.org/~dwmw2/ideapad-2.6	2010-08-13 18:04:52 -07:00
hid
hwmon	hwmon: (via-cputemp) Remove bogus "SHOW" global variable	2010-08-14 21:09:02 +02:00
i2c	Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux	2010-08-14 11:57:54 -07:00
ide
idle	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2010-08-15 11:17:52 -07:00
ieee1394
ieee802154
infiniband	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
input	Merge branch 'for-2.6.36' into for-2.6.37	2010-08-16 18:42:58 +01:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-13 10:38:12 -07:00
leds	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
lguest
macintosh	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-08-12 10:06:29 -07:00
mca
md	dm mpath: support discard	2010-08-12 04:14:32 +01:00
media	v4l: Remove reference to bkl ioctl in compat ioctl handling	2010-08-14 00:24:24 +02:00
memstick	memstick: fix hangs on unexpected device removal in mspro_blk	2010-08-12 08:43:31 -07:00
message	fusion: add function parameter names to kernel-doc	2010-08-14 16:21:00 -07:00
mfd	Merge branch 'for-2.6.36' into for-2.6.37	2010-08-16 18:42:58 +01:00
misc	Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2010-08-12 10:01:59 -07:00
mmc	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2010-08-14 11:54:09 -07:00
mtd	Merge git://git.infradead.org/mtd-2.6	2010-08-15 17:32:47 -07:00
net	pcmcia: xirc2ps_cs bugfix	2010-08-13 16:55:26 -07:00
nubus
of
oprofile
parisc
parport	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
pci	Merge git://git.infradead.org/iommu-2.6	2010-08-15 17:34:20 -07:00
pcmcia	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
platform	ideapad: Only allow camera state to be set to 0 or 1	2010-08-11 18:00:52 +01:00
pnp
power	Merge git://git.infradead.org/battery-2.6	2010-08-12 09:58:33 -07:00
pps
ps3
rapidio
regulator
rtc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
s390	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2010-08-13 10:54:04 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-14 12:34:34 -07:00
serial	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-12 09:11:31 -07:00
sfi
sh
sn
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2010-08-14 11:54:09 -07:00
ssb
staging
tc
telephony
thermal
uio
usb	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-08-12 10:06:29 -07:00
uwb
vhost
video	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-08-12 10:06:29 -07:00
virtio
vlynq
w1
watchdog	watchdog: hpwdt (12/12): Make NMI decoding a compile-time option	2010-08-13 20:54:53 +00:00
xen	Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2010-08-12 09:09:41 -07:00
zorro
Kconfig
Makefile