I didn't make it entirely clear that my last patch was an incremental on
top of this morning's patch.  Here's the full patch.

Dave McCracken

======================================================================
Dave McCracken          IBM Linux Base Kernel Team      1-512-838-3059
dmccr@us.ibm.com                                        T/L   678-3059