Merge branch 'for-3.3' of git://sources.calxeda.com/kernel/linux into highbank/devel
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 23:01:07 +0000 (15:01 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 23:01:07 +0000 (15:01 -0800)

Trivial merge