diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 20:33:47 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 20:33:47 +0000 |
| commit | e594a97c8c74533ec105b2ac9194217e918f172f (patch) | |
| tree | 303a27ada37a9b433103d7e5e82cecb1ce9d36cb /lib/cpu-notifier-error-inject.c | |
| parent | f66f9bdf6d2c2b540f73bb57bd24b886b39beb14 (diff) | |
| parent | d5be5f549c9d619fe3e16160c453a72f718284de (diff) | |
Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
* 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: dm644x evm: add support for VPBE display
ARM: davinci: dm644x: add support for v4l2 video display
* included from the davinci/cleanup branch:
ARM: davinci: dm644x: don't force vpfe registeration on all boards
ARM: davinci: dm644x: fix inconsistent variable naming
ARM: davinci: dm644x: improve readability using macro
ARM: davinci: streamline sysmod access
ARM: davinci: create new common platform header for davinci
ARM: davinci: dm646x: move private definitions to C file
ARM: davinci: dm365: move private definitions to C file
ARM: davinci: dm644x: move private definitions to C file
Conflicts:
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-neuros-osd2.c
arch/arm/mach-davinci/board-sffsdr.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'lib/cpu-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions