Merge remote-tracking branch 'github/3.10/adbsyn' into 3.10/master
Merge remote-tracking branch 'github/3.10/aufs' into 3.10/master
Merge remote-tracking branch 'github/3.10/bfq' into 3.10/master
Merge remote-tracking branch 'github/3.10/cko' into 3.10/master
Merge remote-tracking branch 'github/3.10/fbcondecor' into 3.10/master
Merge remote-tracking branch 'github/3.10/firmware' into 3.10/master
Merge remote-tracking branch 'github/3.10/layer7' into 3.10/master
Merge remote-tracking branch 'github/3.10/march-native' into 3.10/master
Merge remote-tracking branch 'github/3.10/misc' into 3.10/master
Merge remote-tracking branch 'github/3.10/nr-tty' into 3.10/master

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