Arnd Bergmann d2819f80d4 Merge branch 'spear/pinctrl' into spear/clock ... Conflicts: arch/arm/mach-spear3xx/Makefile arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear6xx/clock.c arch/arm/plat-spear/Makefile drivers/pinctrl/core.c This resolves some annoying merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 15:33:42 +02:00
..
acpi	…
asm-generic	…
crypto	…
drm	Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes	2012-04-12 17:42:01 +01:00
keys	…
linux	Merge branch 'spear/pinctrl' into spear/clock	2012-05-14 15:33:42 +02:00
math-emu	…
media	…
misc	…
mtd	…
net	mac80211: Convert WARN_ON to WARN_ON_ONCE	2012-04-09 15:54:48 -04:00
pcmcia	…
rdma	…
rxrpc	…
scsi	SCSI: Fix error handling when no ULD is attached	2012-04-15 11:08:53 -07:00
sound	ALSA: hda - hide HDMI/ELD printks unless snd.debug=2	2012-04-10 14:53:55 +02:00
target	…
trace	…
video	…
xen	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-04-04 17:13:43 -07:00
Kbuild	…