What's the difference between a linear model and a general linear model?

Maybe:
$Y=a*X + b$ - general linear
and
$Y=a*\psi(X) + b$ - linear ?