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

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