]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 23 Jul 2013 02:50:11 +0000 (19:50 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 23 Jul 2013 02:54:21 +0000 (19:54 -0700)
commitcc23ee49d36fe5ce1435f75e5312bee9d76010c2
tree0d8eeffb1d0a93316d8027c0d2c838145080623c
parentab116a4df4942c78c189d9b0744dd940ab9e00b9
parentcf690331642010a837c026088588761f61528ddf
Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

From Sekhar Nori:
DaVinci fixes for v3.11-rc2

The pull request includes fixes for sparse warnings, defconfig changes to
enable DMA usage on peripherals and removal of a duplicated include file.

* tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: defconfig: enable EDMA driver
  ARM: davinci: make file local variables static
  ARM: edma: remove duplicated include from edma.c

Signed-off-by: Olof Johansson <olof@lixom.net>