summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/pm.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-16 23:35:17 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-16 23:35:17 +0000
commit2472f3c8d8fc18b25b2cf1574c036e238187c0ff (patch)
tree485458b51ef0b5509376b56e6ff2e1b124f9c048 /arch/arm/mach-pxa/pm.c
parentd081377dfda42beab13d8b4af876571ce7661174 (diff)
parent31bb68a314e9a2c9fbe054441b18c0608585605e (diff)
parent5dab26af1bacad9a7189d904fbc8b4fe8e95dd81 (diff)
parent4e8d76373c9fd7a1c1b401fc97ba01c0ecbb888f (diff)
parentb6338bdc8305b27688a7feb8689e4ccfd42f0292 (diff)
parentf512626f5baf09c1d40d098462a986417f4e9790 (diff)
parentbf0c11183fc3a2acce56d2b53f2a117322bd3c3b (diff)
parent941aefac4c243cf407d7665d3e64beb32d556acf (diff)
parentf45b1149911cc4c3ab50e56c8844ad4ec04a4575 (diff)
parent981a95d37126cdf09e1dba3884305c2e25375bfb (diff)
parent6e266b204b853b960ad038e62f31c1671f930b87 (diff)
parent21f47fbc5b18da4a3db680959aee887612ec9a72 (diff)
Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel