Merge branch 'at91/macb' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 14:32:28 +0000 (14:32 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 14:32:28 +0000 (14:32 +0000)

Trivial merge