diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-02 21:30:01 +0200 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-02 21:30:01 +0200 |
commit | 6ed268f0a8f36c406e00029634045da4a927ee5e (patch) | |
tree | 848fc4dda12bffeced067a46118f043feb53040d /patches/memtest-0.0.4/series | |
parent | fc8ec6f81bf4eeafc512472ee93bf7961a6eea16 (diff) | |
parent | feb44bc3ab5f5843847f6d2e58c2519b8367aa96 (diff) | |
download | ptxdist-6ed268f0a8f36c406e00029634045da4a927ee5e.tar.gz ptxdist-6ed268f0a8f36c406e00029634045da4a927ee5e.tar.xz |
Merge branch 'stable/ptxdist-2010.03.x' of git://git.pengutronix.de/git/ptxdist into stable/ptxdist-2010.05.xstable/ptxdist-2010.05.x
Conflicts:
configure.ac
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/memtest-0.0.4/series')
0 files changed, 0 insertions, 0 deletions