]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
  hmt: adjust for new pwm_backlight->notify prototype


Trivial merge