| commit | 4742dc1d7670bd00253d2dfb637d55446dc6ef81 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Mar 2008 06:23:39 +0000 (24 23:23 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 25 Mar 2008 06:23:39 +0000 (24 23:23 -0700) | ||
| tree | d22a9b7002413e692b8eda18f20b555c06263921 | treesnapshot (tar.gz zip) |
| parent | 49741c4d01554c2630cea02cfdf236b17062a912 | commitdiff |
| parent | 815d2d50da41f28aae58f5e9b3c61c3094422749 | commitdiff |
Merge git://git./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
* 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