diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 08:19:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-25 08:19:29 +0100 |
| commit | 06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355 (patch) | |
| tree | 5377c063ed07aed23eb9da0bfecfca307f8da0bc /arch/arm/include/asm/localtimer.h | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
| parent | 7816e210a7e4681fb775bbb57bffbef3cc4aa456 (diff) | |
| parent | f73765fcb8bb79e80af58059441eb931679e68c0 (diff) | |
| parent | 70e5f5efcc933af55a3a18efdb3b2edd3eb510ec (diff) | |
| parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
| parent | daece59689e76ed55d8863cae04993679a8e844e (diff) | |
| parent | d7c5d0dcffb3b5702d9477faceff4b8398e6fed0 (diff) | |
| parent | a06f916b7a9b57447ceb875eb0a89f1a66b31bca (diff) | |
Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus