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

Conflicts:
	drivers/tty/Kconfig
Merge remote-tracking branch 'github/3.18/psx2usb' into 3.18/master
Merge remote-tracking branch 'github/3.18/tp_smapi' into 3.18/master
Merge remote-tracking branch 'github/3.18/ureadahead' into 3.18/master
Merge remote-tracking branch 'github/3.18/vhba' into 3.18/master
Merge remote-tracking branch 'github/3.18/yeah' into 3.18/master
Merge remote-tracking branch 'github/3.18/zen-logo' into 3.18/master
Merge remote-tracking branch 'github/3.18/zen-tag' into 3.18/master
Merge tag 'v3.18.1' into 3.18/master

This is the 3.18.1 stable release

Conflicts:
	Makefile