projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb1ae63 75392dd)
Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Wed, 7 Apr 2010 18:03:06 +0000 (11:03 -0700)
committerLinus Torvalds <[email protected]>
Wed, 7 Apr 2010 18:03:06 +0000 (11:03 -0700)
* '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

1  2 
arch/arm/mach-davinci/dma.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-davinci/dma.c
Simple merge
John Crispins staging tree