Merge branch 'at91/defconfig' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:34 +0000 (22:02 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 06:02:34 +0000 (22:02 -0800)

Trivial merge