tree bc16200f3b6ea150b298422754e32959eaa339bc
parent 951c486f62490e032da0ad17e93270b0cfb6687f
parent 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe
author Arnd Bergmann <arnd@arndb.de> 1322081261 +0000
committer Arnd Bergmann <arnd@arndb.de> 1322081261 +0000

Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers