From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Jul 2011 06:28:23 +0000 (-0700)
Subject: Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f1a04dbd1e7b497467d488dd35155014eaee8f9b;p=~shefty%2Frdma-dev.git

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C2440: fix section mismatch on mini2440
  ARM: S3C24XX: drop return codes in void function of dma.c
  ARM: S3C24XX: don't use uninitialized variable in dma.c
  ARM: EXYNOS4: Set appropriate I2C device variant
  ARM: S5PC100: Fix for compilation error
  spi/s3c64xx: Bug fix for SPI with different FIFO level
  ARM: SAMSUNG: Add tx_st_done variable
  ARM: EXYNOS4: Address a section mismatch w/ suspend issue.
  ARM: S5P: Fix bug on init of PWMTimers for HRTimer
  ARM: SAMSUNG: header file revised to prevent declaring duplicated
  ARM: EXYNOS4: fix improper gpio configuration
  ARM: EXYNOS4: Fix card detection for sdhci 0 and 2
---

f1a04dbd1e7b497467d488dd35155014eaee8f9b