Mauro Carvalho Chehab 12cbfd0a3c Merge tag 'v3.2-rc2' into staging/for_v3.3 ... * tag 'v3.2-rc2': (3068 commits) Linux 3.2-rc2 hfs: add sanity check for file name length fsl-rio: fix compile error blackfin: Fixup export.h includes Blackfin: add serial TX IRQ in individual platform resource virtio-pci: fix use after free ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression) drm/radeon/kms/combios: fix dynamic allocation of PM clock modes [CPUFREQ] db8500: fix build error due to undeclared i variable bma023: Add SFI translation for this device vrtc: change its year offset from 1960 to 1972 ce4100: fix a build error arm/imx: fix imx6q mmc error when mounting rootfs arm/imx: fix AUTO_ZRELADDR selection arm/imx: fix the references to ARCH_MX3 ARM: mx51/53: set pwm clock parent to ipg_perclk btrfs: rename the option to nospace_cache drm/radeon/kms/pm: switch to dynamically allocating clock mode array drm/radeon/kms: optimize r600_pm_profile_init drm/radeon/kms/pm: add a proper pm profile init function for fusion ... Conflicts: drivers/media/radio/Kconfig		2011-11-23 19:42:09 -02:00
..
as102	[media] staging: as102: Eliminate as10x_handle_t alias	2011-11-08 11:33:25 -02:00
cxd2099	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
dt3155v4l	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
easycap	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
go7007	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
lirc	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
solo6x10	Merge tag 'v3.2-rc2' into staging/for_v3.3	2011-11-23 19:42:09 -02:00
Kconfig	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
Makefile	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00