Merge branch 'misc' into for-next
authorMichal Marek <mmarek@hera.kernel.org>
Fri, 4 Jun 2010 09:19:09 +0000 (09:19 +0000)
committerMichal Marek <mmarek@hera.kernel.org>
Fri, 4 Jun 2010 09:19:09 +0000 (09:19 +0000)

Trivial merge