Also... surprise!  Andrew Morton's aic7xxx build fix
is also included.  Ah well, 1001 people probably applied
the same patch by hand, and it's easy to merge, so oh well.