Merge branches 'fixes.2012.04.18a' and 'inline.2012.04.18a' of ../linux-2.6-tip into HEAD