Marek Szyprowski 0f51596bd3 Merge branch 'for-next-arm-dma' into for-linus ... Conflicts: arch/arm/Kconfig arch/arm/mm/dma-mapping.c Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>		2012-05-22 08:55:43 +02:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-05-05 10:06:06 -07:00
asm-generic	Merge branch 'for-next-arm-dma' into for-linus	2012-05-22 08:55:43 +02:00
crypto	crypto: user - Fix lookup of algorithms with IV generator	2012-03-29 19:52:47 +08:00
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	drivers: add Contiguous Memory Allocator	2012-05-21 15:09:37 +02:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-05-14 11:23:37 -07:00
misc
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2012-05-15 16:38:00 -04:00
pcmcia
rdma
rxrpc
scsi	[SCSI] libsas, libata: fix start of life for a sas ata_port	2012-04-23 12:11:47 +01:00
sound	ALSA: hda - hide HDMI/ELD printks unless snd.debug=2	2012-04-10 14:53:55 +02:00
target
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-04-04 10:04:42 -07:00
video	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
xen	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-04-04 17:13:43 -07:00
Kbuild