diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-22 14:32:39 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-22 14:32:39 +0400 |
| commit | 9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743 (patch) | |
| tree | 1ebcd9c9812a0b2857ef9bae39a399c3283dcdb1 /init | |
| parent | 13420c6b5bac9b05cf9a0ba9c46b8e1d18d45730 (diff) | |
| parent | ca06679d758933b726c2677b523a26bc581eadcf (diff) | |
| download | linux-9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743.tar.xz | |
Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
Conflicts:
arch/arm/mach-imx/mm-imx3.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions