Merge tag 'v3.4.93' into stock

This is the 3.4.93 stable release

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
Merge tag 'v3.4.94' into test

This is the 3.4.94 stable release

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/staging/zram/zram_sysfs.c
Merge tag 'v3.4.95' into test

This is the 3.4.95 stable release

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	lib/lzo/lzo1x_compress.c

Conflicts:
	lib/lzo/lzo1x_compress.c