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

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