or Linus Torvalds <torvalds@linux-foundation.org> 1264124003 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264124003 -0800

Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  hmt: adjust for new pwm_backlight->notify prototype