From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Feb 2011 23:00:47 +0000 (-0800)
Subject: Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~7613^2~2403
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b08b69a110bd981909c248f89997dcdcdfd5a39c;p=firefly-linux-kernel-4.4.55.git

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

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV210: Fix regulator names
  ARM: S5PV210: Update max8998_platform_data
  ARM: SAMSUNG: Drop exporting s3c24xx_ts_set_platdata
  ARM: S5P: Fix end address in memory resource information for UART devices
  ARM: S5P64X0: Cleanup map.h file
  ARM: S5P6442: Cleanup map.h file
  ARM: S5PC100: Clenaup map.h file
  ARM: S5PV210: Cleanup map.h file
  ARM: S5PV310: Cleanup map.h file
---

b08b69a110bd981909c248f89997dcdcdfd5a39c