diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-26 10:10:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-26 10:10:12 +0200 |
| commit | e93aabb5522be0a42b95be4ca91ef8f530c26975 (patch) | |
| tree | 98a17a27766e86ffb8976aed625e96e1e945d9da | |
| parent | 91dcc7f437d3e8224dec51f2e0808ba8171309a9 (diff) | |
| parent | c52c983551ba3fb991f91eff4d924a375b0f9b83 (diff) | |
| parent | d5534ba6c783a36332e55036273411f4d14b9af6 (diff) | |
| parent | f32609c5a035043bed9a848470721220bf7002b9 (diff) | |
| parent | 87d022cc494dd4dd86d15cb149fa721ac3b45969 (diff) | |
Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd