diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 23:27:56 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 23:27:56 +0200 |
| commit | a20df564d15bd28e3df24e1c65b885bd74d23f17 (patch) | |
| tree | df2fc17a1dbd53122de2785868cf9fbaeecf2122 /arch/m68k/mvme147 | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| parent | ARM: Auto calculate ZRELADDR and provide option for exceptions (diff) | |
| download | linux-a20df564d15bd28e3df24e1c65b885bd74d23f17.tar.xz linux-a20df564d15bd28e3df24e1c65b885bd74d23f17.zip | |
Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/m68k/mvme147')
0 files changed, 0 insertions, 0 deletions