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)
commit8d7458daea2a6809d32418bf489b949d23de99ea
tree8c4356632108c4849328cb1464621210dad2d572
parent3975d16760d4be7402d1067c548c30c427971331
parentaf0d5cb908f7f9adeb5d3d3dbef64c644bb6809c
Merge branch 'bkl/fixes' of git://git./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