commit 63634c86365b530af5026d409fd403801abe1e75
author Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 07 11:03:06 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 07 11:03:06 2010 -0700
tree e2a323882ddd4d30ff8c6445965cdda1ce480477
parent fb1ae635772d679eb312fa447290fc02cd0e4cf1
parent 75392dd3041b8fb7ee4cef6bd9b71154ae34f4e1

Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  davinci: fix compile warning: <mach/da8xx.h>: #include <linux/platform_device.h>
  davinci: DM365: fix duplicate default IRQ priorities
  davinci: edma: clear events in edma_start()
  davinci: da8xx/omap-l1: fix build error when CONFIG_DAVINCI_MUX is undefined
  davinci: timers: don't enable timer until clocksource is initialized