firmware: Add parameter for setting dynamic resample ratio for audio_mixer
kernel: config: Add CRYPTO_CTS module
See: https://github.com/raspberrypi/linux/pull/706

kernel: config: Support ATM modules for USB ADSL modem support
See: https://github.com/raspberrypi/linux/pull/543

kernel: lirc_rpi: Add parameter to specify input pin pull
See: https://github.com/raspberrypi/linux/pull/665

kernel: vchiq: Move logging control into debugfs

firmware: audio_mixer: Add more support for 24-bit formats
See: http://forum.xbmc.org/showthread.php?tid=206262

firmware: audioplus: Always use 48kHz for pwm when de-popping is enabled
See: https://github.com/raspberrypi/firmware/issues/324

firmware: platform: Reorganise so config.txt is parsed before gpioman is set up

firmware: config: Remove gpio_pads config. Drive strength can be set through gpioman

firmware: audio_mixer: Check port number with resample parameter
Merge remote-tracking branch 'origin/master' into 3.16.y

Conflicts:
	Module.symvers
	git_hash
	kernel.img
	modules/3.12.29+/kernel/drivers/staging/media/lirc/lirc_rpi.ko
	modules/3.12.29+/modules.alias
	modules/3.12.29+/modules.alias.bin
	modules/3.12.29+/modules.dep
	modules/3.12.29+/modules.dep.bin
	modules/3.12.29+/modules.order
	modules/3.12.29+/modules.symbols
	modules/3.12.29+/modules.symbols.bin