zen: Attack of the Giant Nanobots
Merge remote-tracking branch 'github/3.12/adbsyn' into 3.12/master
Merge remote-tracking branch 'github/3.12/aufs' into 3.12/master
Merge remote-tracking branch 'github/3.12/bfq' into 3.12/master
Merge remote-tracking branch 'github/3.12/cko' into 3.12/master
Merge remote-tracking branch 'github/3.12/exfat' into 3.12/master
Merge remote-tracking branch 'github/3.12/fbcondecor' into 3.12/master
Merge remote-tracking branch 'github/3.12/firmware' into 3.12/master
Merge remote-tracking branch 'github/3.12/layer7' into 3.12/master
Merge remote-tracking branch 'github/3.12/march-native' into 3.12/master
Merge remote-tracking branch 'github/3.12/misc' into 3.12/master
Merge remote-tracking branch 'github/3.12/nr-tty' into 3.12/master

Conflicts:
	drivers/tty/Kconfig
Merge remote-tracking branch 'github/3.12/psx2usb' into 3.12/master
Merge remote-tracking branch 'github/3.12/tp_smapi' into 3.12/master
Merge remote-tracking branch 'github/3.12/uksm' into 3.12/master
Merge remote-tracking branch 'github/3.12/ureadahead' into 3.12/master
Merge remote-tracking branch 'github/3.12/vhba' into 3.12/master
Merge remote-tracking branch 'github/3.12/yeah' into 3.12/master
Merge remote-tracking branch 'github/3.12/zen-logo' into 3.12/master
Merge remote-tracking branch 'github/3.12/zen-tag' into 3.12/master