]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'omap/hsmmc' into next/drivers
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:12:59 +0000 (12:12 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:12:59 +0000 (12:12 -0800)

Trivial merge