diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-04-05 19:07:03 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-04-05 19:07:03 +0200 |
| commit | ff56f6aedd002d41a561bb1e885e74e76c17b19e (patch) | |
| tree | 14dfd212a806e1a4f2e1c38fa2b4355e20448935 /scripts | |
| parent | 0f70f6bf8c1d0fca8a7d12c8f62c7011c9899064 (diff) | |
| parent | 80a920b397a6531864d1fc08c509db8886f54904 (diff) | |
| parent | c143fbc64435c445a1fe3086e5a547017d0dc36b (diff) | |
| download | ptxdist-ff56f6aedd002d41a561bb1e885e74e76c17b19e.tar.gz ptxdist-ff56f6aedd002d41a561bb1e885e74e76c17b19e.tar.xz | |
Merge branches 'next/version-bumps' and 'next/patchin' of git://git.pengutronix.de/git/mkl/ptxdist into HEAD