| commit | a20df564d15bd28e3df24e1c65b885bd74d23f17 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jul 29 22:27:56 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jul 29 22:27:56 2010 +0100 |
| tree | df2fc17a1dbd53122de2785868cf9fbaeecf2122 | |
| parent | d50f58bbd979e86378dfdec982452041f0e604ef [diff] | |
| parent | e69edc7939abda1f696c482faa8168d80420f75c [diff] |
Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable Conflicts: arch/arm/Kconfig