diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-13 00:44:30 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-13 00:44:35 +0200 |
commit | 92633b72d18ca4f25de1f28e436a882159491e7e (patch) | |
tree | 8af578da7852d20c034a92c8919d6c6ca4f82da8 | |
parent | [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes (diff) | |
parent | ARM: OMAP: N770: add missing LCD, LCD controller, touchscreen device registra... (diff) | |
parent | ARM: OMAP: Merge driver headers from N800 tree (diff) | |
download | linux-92633b72d18ca4f25de1f28e436a882159491e7e.tar.xz linux-92633b72d18ca4f25de1f28e436a882159491e7e.zip |
Merge branches 'omap1-upstream' and 'omap2-upstream' into devel