diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-04 10:55:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-04 10:55:53 +0200 |
| commit | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 (patch) | |
| tree | 18e25b63029029da77057c7bfa02f9daacaa1c3e | |
| parent | 6da5ce1728e3058312b6cf36786189002de1407d (diff) | |
| parent | f548897ffc0510885af27e22a11f449fe5e0cbbd (diff) | |
| parent | a6d3404891834ed3cd2c80d77d43094205d7390b (diff) | |
Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup