Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 01:05:09 +0000 (18:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 01:05:09 +0000 (18:05 -0700)
* 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  hp_sdc_rtc: fix broken ioctl conversion


Trivial merge