Linux 3.4.92

Signed-off-by: LaboDJ <jacopolabardi@gmail.com>

Conflicts:

	arch/x86/kernel/setup.c
	arch/x86/platform/efi/efi.c
	drivers/block/nbd.c
	drivers/firmware/efivars.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/drm/radeon/radeon_combios.c
	drivers/input/mouse/synaptics.c
	drivers/md/persistent-data/dm-btree-remove.c
	drivers/net/can/sja1000/sja1000.c
	drivers/pci/hotplug/shpchp.h
	drivers/pci/hotplug/shpchp_core.c
	drivers/pci/hotplug/shpchp_ctrl.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/ftdi_sio_ids.h
	drivers/usb/serial/option.c
	drivers/usb/storage/unusual_devs.h
	fs/stat.c
	include/linux/efi.h
	kernel/trace/ftrace.c
	kernel/trace/trace.c
	net/core/skbuff.c
	net/ipv4/ip_forward.c
	sound/pci/hda/patch_conexant.c
ipv4: fix merge derp