Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 23:58:42 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 23:58:42 +0000 (16:58 -0700)
commita41842f70d6d6b0cfde3d21e163add81c4318ebd
tree238fc75a5d10adc70ef7a4c812ac5cbd366fb9b5
parent722874465e3cd3268387b96e02220f84b35a8d98
parent0e17226f7cd289504724466f4298abc9bdfca3fe
Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux:
  ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362
  ARM: SAMSUNG: Fix build error from stale define in <plat/uncompress.h>
  ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver
  ARM: S3C2440: Fix s3c2440 cpufreq compilation post move.