summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-17 11:52:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-17 11:53:39 +0100
commitc39e52a793f5599582dbacf4d8f62634a492f79e (patch)
tree7379649b5a722ceb45cc66f049a7571c66054dcd
parent762253741942d8ddbaca1c1ee62d7ed57544332b (diff)
parent8716011315a5b2fa932fa1e7570c34975ed2cb14 (diff)
parent4fec9978822a66b25f5645eb20c115034a18cfd1 (diff)
parentde4338f40e48da3b604219909a1d4aa7aa60870f (diff)
parent47ab0dee661dbd5aca67abe44a333e471134fbf9 (diff)
parent2a847513cdecd517f7efc06296c539c3a936cf98 (diff)
parent883413341e479d4e9f9c69def4884b4c6e1cef4e (diff)
parent3e9cc70590287f7cb7e38793bbf968b3362b7612 (diff)
parent4c18e77f718cdda33363132127db4df795eadbd9 (diff)
parentf417cbad7394fdccec850d13d7d5621516d693ce (diff)
Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel
Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig