| commit | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon May 06 23:43:45 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon May 06 23:43:45 2013 +0200 |
| tree | ca8654a286f61da917318645cab9e061095ecdba | |
| parent | a94d236dc355f374857ee4e6e78b7dec8a0f29e3 [diff] | |
| parent | f31c2f1c68aff83277eddc6798adf3438e9c680a [diff] |
Merge branch 'late/clksrc' into late/cleanup There is no reason to keep the clksrc cleanups separate from the other cleanups, and this resolves some merge conflicts. Conflicts: arch/arm/mach-spear/spear13xx.c drivers/irqchip/Makefile