Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/master