commit | bf9f6c8fcd390a349be2e57f813c0b54fb0d0578 | [log] [tgz] |
---|---|---|
author | Sascha Hauer <s.hauer@pengutronix.de> | Mon Jan 31 09:23:41 2011 +0100 |
committer | Sascha Hauer <s.hauer@pengutronix.de> | Mon Jan 31 09:23:41 2011 +0100 |
tree | ae98aa67ad534d9f01e0cdbc1d07c0ccefe57346 | |
parent | 4404117d745f2251c5d3c739c50f617e755dbe12 [diff] | |
parent | 53cdd3068b7b8e3a1a0e540ec42d9037296243b7 [diff] |
Merge branch 'imx-board-ifdefs' into imx-for-2.6.39