From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2009 19:27:26 +0000 (-0800)
Subject: Merge branch 'fixes-s3c-2632-rc6' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v3.0~6999
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ed23743077019e7790234c58e9af678664581df;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'fixes-s3c-2632-rc6' of git://git.fluff.org/bjdooks/linux

* 'fixes-s3c-2632-rc6' of git://git.fluff.org/bjdooks/linux:
  ARM: S3C64XX: DMA: Free node for non-circular queues
  ARM: S3C64XX: DMA: Callback with correct buffer pointer
  ARM: S3C64XX: DMA: Make src and dst transfer size same
  ARM: S3C64XX: DMA: Unify callback functions for success/failure
  ARM: S3C64XX: DMA: Protect buffer pointers while manipulation
  ARM: S3C64XX: Tidy definition and comments in s3c_dma_has_circular()
  ARM: S3C64XX: Remove duplicate s3c_dma_has_circular() definition for S3C64xx.
  ARM: SMDK6410: Allocate more GPIO space for WM1190-EV1
  ARM: SMDK6410: Configure GPIO pull up for WM835x IRQ line
---

1ed23743077019e7790234c58e9af678664581df