Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:47:41 +0000 (20:47 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:47:41 +0000 (20:47 +0000)

Trivial merge