tree 8c4356632108c4849328cb1464621210dad2d572
parent 3975d16760d4be7402d1067c548c30c427971331
parent af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c
author Linus Torvalds <torvalds@linux-foundation.org> 1276045509 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1276045509 -0700

Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

* 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  hp_sdc_rtc: fix broken ioctl conversion