tree a6b95952bb997d92e575304abb5a3d5c0ebdc73f
parent b4f5c46245cf4ca437849c0d04c176b4c150622d
parent d1061331b72e2e1420187e4684740b4a481c73a4
author Linus Torvalds <torvalds@linux-foundation.org> 1298329247 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1298329247 -0800

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: 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