Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2010 01:33:23 +0000 (17:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jan 2010 01:33:23 +0000 (17:33 -0800)
commit298a4c3a57fed38df365a6807728d1930a72c728
treef8836c6a0be6b4810221fa801378b752b41a476c
parent92dcffb916d309aa01778bf8963a6932e4014d07
parent1619ce111492d733d425acbacec9a2cb2ba16ed9
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