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 ?

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 ?

These forms come from the relevant Wikipedia articles on the linear and general linear models.