Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2010 18:43:18 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2010 18:43:18 +0000 (11:43 -0700)
commit8ea3f0afb23bc49a996f262ea04708b38de82bca
tree27f7708b3f165cab0fec7ac335fba146054d9f4a
parente92ba6d2ec8f83a26deb68dd3c2a195657dfdebe
parent7cf4b482f06df0b590a9bc1561a5a81d67e0fe4c
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: SAMSUNG: Add a workaround for get_clock() for serial driver
  ARM: S5P: Bug fix on errors of build with CONFIG_PREEMPT_NONE
  ARM: SAMSUNG: Fix build warnings because of unused codes