Arnd Bergmann e594a97c8c 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>

2012-03-15 20:33:47 +00:00

..

include/mach

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers

2012-03-15 20:33:47 +00:00

aemif.c

davinci: aemif: signedness bug in davinci_aemif_setup_timing()

2010-12-10 07:33:51 -08:00

board-da830-evm.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

board-da850-evm.c

ARM: davinci: update mdio bus name

2012-01-27 22:29:09 +05:30

board-dm355-evm.c

ARM: davinci: create new common platform header for davinci

2012-02-25 02:40:13 +05:30

board-dm355-leopard.c

ARM: davinci: create new common platform header for davinci

2012-02-25 02:40:13 +05:30

board-dm365-evm.c

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers

2012-03-15 20:33:47 +00:00

board-dm644x-evm.c

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers

2012-03-15 20:33:47 +00:00

board-dm646x-evm.c

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers

2012-03-15 20:33:47 +00:00

board-mityomapl138.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

board-neuros-osd2.c

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers

2012-03-15 20:33:47 +00:00

board-omapl138-hawk.c

ARM: davinci: update mdio bus name

2012-01-27 22:29:09 +05:30

board-sffsdr.c

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers

2012-03-15 20:33:47 +00:00

board-tnetv107x-evm.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

cdce949.c

arm: fix implicit module.h users by adding it to arch/arm as required.

2011-10-31 19:30:50 -04:00

clock.c

ARM: davinci: add support for multiple power domains

2011-12-03 00:35:52 +05:30

clock.h

ARM: davinci: add support for multiple power domains

2011-12-03 00:35:52 +05:30

common.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

cp_intc.c

arm: Cleanup the irq namespace

2011-03-29 14:47:57 +02:00

cpufreq.c

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

cpuidle.c

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

da830.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

da850.c

ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks

2012-01-20 21:56:28 +05:30

davinci.h

ARM: davinci: dm644x: add support for v4l2 video display

2012-03-11 12:41:29 +05:30

devices-da8xx.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

devices-tnetv107x.c

ARM: davinci: Explicitly set channel controllers' default queues

2011-09-17 15:54:08 +05:30

devices.c

ARM: davinci: streamline sysmod access

2012-02-25 02:40:17 +05:30

dm355.c

ARM: davinci: streamline sysmod access

2012-02-25 02:40:17 +05:30

dm365.c

ARM: davinci: streamline sysmod access

2012-02-25 02:40:17 +05:30

dm644x.c

ARM: davinci: dm644x: add support for v4l2 video display

2012-03-11 12:41:29 +05:30

dm646x.c

ARM: davinci: streamline sysmod access

2012-02-25 02:40:17 +05:30

dma.c

ARM: davinci: edma: use kzalloc()

2011-09-17 15:54:09 +05:30

irq.c

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-19 22:10:05 -07:00

Kconfig

ARM: davinci: AM18x: Add wl1271/wlan support

2011-09-17 15:53:23 +05:30

Makefile

ARM: mach-davinci: remove arch specific special handling for ioremap

2011-11-15 22:30:39 -05:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

mux.c

Davinci: pinmux - use ioremap()

2010-05-13 10:05:29 -07:00

mux.h

Davinci: eliminate pinmux offset verbosity

2010-05-06 15:02:09 -07:00

pm.c

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

psc.c

ARM: davinci: psc: fix incorrect offsets

2011-12-05 16:47:15 +05:30

serial.c

Davinci: serial - conditional reset via pwremu

2010-05-06 15:02:10 -07:00

sleep.S

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-10-31 23:11:53 +01:00

sram.c

DaVinci: remove unneeded #include's

2009-11-25 10:21:31 -08:00

time.c

Merge branch 'devel-stable' into devel

2011-01-06 22:33:32 +00:00

tnetv107x.c

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

usb.c

DA8xx: assign name to MUSB IRQ resource

2010-12-11 12:15:53 +02:00