Mauro Carvalho Chehab 69ecdbac14 Merge remote-tracking branch 'linus/master' into staging/for_v3.5 ... * linus/master: (805 commits) tty: Fix LED error return openvswitch: checking wrong variable in queue_userspace_packet() bonding: Fix LACPDU rx_dropped commit. Linux 3.4-rc7 ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1 ARM: EXYNOS: use s5p-timer for UniversalC210 board ARM / mach-shmobile: Invalidate caches when booting secondary cores ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper MAINTAINERS: Add myself as the cpufreq maintainer dm mpath: check if scsi_dh module already loaded before trying to load dm thin: correct module description dm thin: fix unprotected use of prepared_discards list dm thin: reinstate missing mempool_free in cell_release_singleton gpio/exynos: Fix compiler warnings when non-exynos machines are selected gpio: pch9: Use proper flow type handlers powerpc/irq: Fix another case of lazy IRQ state getting out of sync ks8851: Update link status during link change interrupt ... Conflicts: drivers/media/common/tuners/xc5000.c drivers/media/common/tuners/xc5000.h drivers/usb/gadget/uvc_queue.c		2012-05-15 08:39:25 -03:00
..
fimc-capture.c	Merge remote-tracking branch 'linus/master' into staging/for_v3.5	2012-05-15 08:39:25 -03:00
fimc-core.c	Merge remote-tracking branch 'linus/master' into staging/for_v3.5	2012-05-15 08:39:25 -03:00
fimc-core.h	Merge remote-tracking branch 'linus/master' into staging/for_v3.5	2012-05-15 08:39:25 -03:00
fimc-mdevice.c	[media] s5p-fimc: Handle sub-device interdependencies using deferred probing	2012-04-10 15:25:25 -03:00
fimc-mdevice.h	[media] s5p-fimc: Add the media device driver	2011-09-06 17:35:52 -03:00
fimc-reg.c	[media] s5p-fimc: Don't use platform data for CSI data alignment configuration	2012-04-10 15:22:26 -03:00
Makefile	[media] s5p-fimc: Add the media device driver	2011-09-06 17:35:52 -03:00
mipi-csis.c	[media] s5p-fimc: Handle sub-device interdependencies using deferred probing	2012-04-10 15:25:25 -03:00
mipi-csis.h	[media] s5p-csis: Enable v4l subdev device node	2011-12-30 14:39:54 -02:00
regs-fimc.h	[media] s5p-fimc: Add support for alpha component configuration	2011-12-30 14:06:14 -02:00