diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 02:23:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 02:23:39 -0400 |
commit | 4742dc1d7670bd00253d2dfb637d55446dc6ef81 (patch) | |
tree | d22a9b7002413e692b8eda18f20b555c06263921 /drivers/acpi/scan.c | |
parent | 49741c4d01554c2630cea02cfdf236b17062a912 (diff) | |
parent | 815d2d50da41f28aae58f5e9b3c61c3094422749 (diff) |
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
Diffstat (limited to 'drivers/acpi/scan.c')
0 files changed, 0 insertions, 0 deletions