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

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