[parisc-linux] merge activity

[Grant Grundler]

Grant Grundler wrote:
> > u_long becomes unsigned long
> 
> I've been using "ulong" as well. Is less than desirable as well?
> Feel free to change if it is.

I see that's been done as well. np.

> > old code has mostly been cleaned out
> > a lot of #ifdefs have been removed.
> 
> Some of the "ifdef 0" I have in "my" code are there for future stuff.
> An examples is code related to DELAYED_RESOURCE_CNT in sba_iommu.c.
> Fortunately, this wasn't removed.
> Haw should I mark this to make sure people understand it's work-in-progress?

I do see #ifdef DUMP_RESMAP code (not much code) has been removed.
Obviously it wasn't marked right. :^)
(arch/parisc/kernel/sba_iommu.c)

later,
grant