diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 17:51:21 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 17:51:21 +0000 |
| commit | ef1a68848a968f7347cf7eea24072464059af8f1 (patch) | |
| tree | ba249a734bacd59c1129aa7bde167a8702c7f2b4 /arch/mips/emma | |
| parent | 1508c99506b5d57b8892a5d759176000c88c93b6 (diff) | |
| parent | 0912e5359f89f303f53fd4874dadab77a4949a8a (diff) | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Conflicts:
arch/arm/mach-at91/Kconfig
Diffstat (limited to 'arch/mips/emma')
0 files changed, 0 insertions, 0 deletions