Merge remote-tracking branch 'github/3.9/adbsyn' into 3.9/master
Merge remote-tracking branch 'github/3.9/aufs' into 3.9/master
Merge remote-tracking branch 'github/3.9/bfq' into 3.9/master
Merge remote-tracking branch 'github/3.9/cko' into 3.9/master
Merge remote-tracking branch 'github/3.9/fbcondecor' into 3.9/master
Merge remote-tracking branch 'github/3.9/firmware' into 3.9/master
Merge remote-tracking branch 'github/3.9/layer7' into 3.9/master
Merge remote-tracking branch 'github/3.9/march-native' into 3.9/master
Merge remote-tracking branch 'github/3.9/misc' into 3.9/master
Merge remote-tracking branch 'github/3.9/psx2usb' into 3.9/master
Merge remote-tracking branch 'github/3.9/tp_smapi' into 3.9/master
Merge remote-tracking branch 'github/3.9/ureadahead' into 3.9/master
Merge remote-tracking branch 'github/3.9/vhba' into 3.9/master
Merge remote-tracking branch 'github/3.9/yeah' into 3.9/master
Merge remote-tracking branch 'github/3.9/zen-logo' into 3.9/master
Merge remote-tracking branch 'github/3.9/zen-tag' into 3.9/master
Merge remote-tracking branch 'github/3.9/nr-tty' into 3.9/master

Conflicts:
	drivers/tty/Kconfig