Merge tag 'cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 22:09:49 +0000 (00:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 22:09:49 +0000 (00:09 +0200)
commitddfe53d1cbfcb214f7ea58f13e811937dc74663e
treebc0991ed90b02c2aea3f73b3202f33f7389aed07
parent2b3a47d7a0cda3b35d95a4935d502ff5abab2c4d
parent3d0cb73e9c85e60206ea9d5191bc0b9a0c4c8a99
Merge tag 'cleanup-for-v3.18' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

Pull "Clean-up for omaps for v3.18 merge window" from Tony Lindgren:

- Remove unused pieces of the legacy DMA API as we're moving to
  dmaengine API

- Search and replace to standardize on pr_warn instead of pr_warning

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: mach-omap2: Convert pr_warning to pr_warn
  ARM: OMAP: Remove unused pieces of legacy DMA API
arch/arm/mach-omap2/omap_hwmod.c