From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2008 06:23:39 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.25-rc7~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4742dc1d7670bd00253d2dfb637d55446dc6ef81;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  driver core: debug for bad dev_attr_show() return value.
  UIO: add pgprot_noncached() to UIO mmap code
---

4742dc1d7670bd00253d2dfb637d55446dc6ef81