Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux
Linus Torvalds [Thu, 18 Mar 2010 23:58:42 +0000 (16:58 -0700)]
* '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.


Trivial merge