zen: Stochastic Salmon
Merge remote-tracking branch 'github/3.8/adbsyn' into 3.8/master
Merge remote-tracking branch 'github/3.8/aufs' into 3.8/master
Merge remote-tracking branch 'github/3.8/bfq' into 3.8/master
Merge remote-tracking branch 'github/3.8/cko' into 3.8/master
Merge remote-tracking branch 'github/3.8/dmraid45' into 3.8/master
Merge remote-tracking branch 'github/3.8/fbcondecor' into 3.8/master
Merge remote-tracking branch 'github/3.8/firmware' into 3.8/master
Merge remote-tracking branch 'github/3.8/layer7' into 3.8/master
Merge remote-tracking branch 'github/3.8/march-native' into 3.8/master
Merge remote-tracking branch 'github/3.8/misc' into 3.8/master
Merge remote-tracking branch 'github/3.8/nr-tty' into 3.8/master

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