Merge branch 'slab/urgent' into for-linus
authorPekka Enberg <penberg@cs.helsinki.fi>
Mon, 6 Jul 2009 07:51:54 +0000 (10:51 +0300)
committerPekka Enberg <penberg@cs.helsinki.fi>
Mon, 6 Jul 2009 07:51:54 +0000 (10:51 +0300)

Trivial merge