From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Jun 2010 01:05:09 +0000 (-0700)
Subject: Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: cont_sys_log_2~15
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=8d7458daea2a6809d32418bf489b949d23de99ea

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
---

8d7458daea2a6809d32418bf489b949d23de99ea