summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 00:58:42 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 00:58:42 +0100
commita41842f70d6d6b0cfde3d21e163add81c4318ebd (patch)
tree238fc75a5d10adc70ef7a4c812ac5cbd366fb9b5 /include
parentMerge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze (diff)
parentARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362 (diff)
downloadlinux-a41842f70d6d6b0cfde3d21e163add81c4318ebd.tar.xz
linux-a41842f70d6d6b0cfde3d21e163add81c4318ebd.zip
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.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions