Arnd Bergmann 4f5a9fd341 Merge branch 'imx/pinctrl' into imx/clock ... Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/ethernet/freescale/fec.c drivers/spi/spi-imx.c drivers/tty/serial/imx.c This resolves dependencies between the pinctrl and clock changes in imx. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 15:30:52 +02:00
..
accessibility
acpi	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-04-25 21:29:26 -07:00
amba	ARM: 7366/3: amba: Remove AMBA level regulator support	2012-04-13 14:04:08 +01:00
ata	libata: forbid port runtime pm by default, fixing regression	2012-04-18 14:33:25 -04:00
atm
auxdisplay
base	drivers/base: fix compiler warning in SoC export driver - idr should be ida	2012-04-09 14:54:22 -07:00
bcma	bcma: use fallback sprom if no on chip sprom is available	2012-04-16 13:32:01 -04:00
block	Fixes in various components:	2012-04-20 11:31:00 -07:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2012-04-09 15:47:49 -04:00
cdrom
char	tty and serial fixes for 3.4-rc2	2012-04-12 15:36:33 -07:00
clk
clocksource	Revert "clocksource: Load the ACPI PM clocksource asynchronously"	2012-04-12 00:05:05 +02:00
connector
cpufreq	cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS	2012-04-13 17:57:40 -07:00
cpuidle	Merge branches 'idle-fix' and 'misc' into release	2012-04-06 21:48:59 -04:00
crypto	crypto: talitos - properly lock access to global talitos registers	2012-04-09 15:13:40 +08:00
dca
devfreq
dio
dma	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
edac	Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2012-04-06 17:56:20 -07:00
eisa
firewire
firmware
gpio	ARM: pxa: fix gpio wakeup setting	2012-04-27 10:46:45 +08:00
gpu	drm/i915: Set the Stencil Cache eviction policy to non-LRA mode.	2012-04-28 08:05:15 +01:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-04-20 10:39:33 -07:00
hsi	HSI: hsi_char: Remove max_data_size from sysfs	2012-04-23 14:23:32 +03:00
hv
hwmon	hwmon: (fam15h_power) Fix pci_device_id array	2012-04-26 08:40:08 -07:00
hwspinlock
i2c	i2c: mxs: adopt pinctrl support	2012-05-12 09:43:17 +08:00
ide
idle	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
ieee802154
infiniband	A few fixes for regressions introduced in 3.4-rc1:	2012-04-26 15:35:35 -07:00
input	mfd: Convert twl6040 to i2c driver, and separate it from twl core	2012-04-16 16:45:34 +02:00
iommu	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
isdn	tty and serial fixes for 3.4-rc2	2012-04-12 15:36:33 -07:00
leds	leds-atmel-pwm.c: Make pwmled_probe() __devinit	2012-04-17 16:29:31 +02:00
lguest
macintosh
mca
md	md: fix possible corruption of array metadata on shutdown.	2012-04-24 10:23:16 +10:00
media	media mx3 camera: prepare clk before enabling it	2012-04-25 17:03:42 +02:00
memstick
message
mfd	mfd: Fix modular builds of rc5t583 regulator support	2012-04-16 21:27:07 +02:00
misc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
mmc	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
mtd	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
net	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
nfc
nubus
of	gpio: Fix range check in of_gpio_simple_xlate()	2012-04-10 14:20:56 -06:00
oprofile	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
parisc
parport
pci	Merge branch 'for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2012-04-27 19:32:37 -07:00
pcmcia
pinctrl	pinctrl: implement pinctrl_check_ops	2012-04-11 09:31:02 +02:00
platform	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-26 15:24:45 -07:00
pnp
power
pps
ps3
ptp
rapidio
regulator	regulator: Fix a build warning in the anatop driver for 3.4	2012-04-10 10:26:41 -07:00
remoteproc	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
rpmsg
rtc	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
s390	[S390] s390/char/vmur.c: fix memory leak	2012-04-11 14:28:24 +02:00
sbus
scsi	SCSI: Fix error handling when no ULD is attached	2012-04-15 11:08:53 -07:00
sfi
sh
sn
spi	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
ssb
staging	staging: ozwpan: Fix bug where kfree is called twice.	2012-04-26 12:40:53 -07:00
target	tcm_fc: Do not free tpg structure during wq allocation failure	2012-04-06 18:57:05 -07:00
tc
thermal
tty	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
uio
usb	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
uwb	uwb: fix error handling	2012-04-18 13:15:51 -07:00
vhost	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-22 21:02:57 -07:00
video	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
virt
virtio	virtio_balloon: fix handling of PAGE_SIZE != 4k	2012-04-15 11:51:06 +03:00
vlynq
w1	w1 i.MX: prepare/unprepare clock	2012-04-25 17:03:41 +02:00
watchdog	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
xen	xen/acpi: Workaround broken BIOSes exporting non-existing C-states.	2012-04-26 22:07:28 -04:00
zorro
Kconfig	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00
Makefile	Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi	2012-04-02 09:50:40 -07:00