diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 21:27:45 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 21:27:45 +0100 |
| commit | 5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72 (patch) | |
| tree | c60bdca0529cbd44d32b3918b78d14e182ef57cd /arch/arm/plat-mxc/include/mach/board-mx31ads.h | |
| parent | Merge branch 'omap/uart' into next/pm (diff) | |
| parent | Linux 3.2-rc7 (diff) | |
| download | linux-5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72.tar.xz linux-5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72.zip | |
Merge branch 'v3.2-rc7' into next/pm
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/board-mx31ads.h')
0 files changed, 0 insertions, 0 deletions