Merge branch 'trimslice/upstream' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Thu, 17 Mar 2011 06:08:22 +0000 (23:08 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 17 Mar 2011 06:08:22 +0000 (23:08 -0700)

Trivial merge