diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 21:25:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 21:25:17 +0100 |
| commit | a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (patch) | |
| tree | cac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61 /drivers/cdrom | |
| parent | Merge branch 'ux500/dt' into next/dt2 (diff) | |
| parent | ARM: SPEAr600: Add device-tree support to SPEAr600 boards (diff) | |
| download | linux-a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78.tar.xz linux-a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78.zip | |
Merge branch 'spear/dt' into next/dt2
* spear/dt:
ARM: SPEAr600: Add device-tree support to SPEAr600 boards
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-vexpress/Kconfig
The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions