diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /drivers/firmware | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/firmware/edd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 731c3d5da0dc..88f462122a30 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig | |||
| @@ -64,7 +64,7 @@ config DELL_RBU | |||
| 64 | help | 64 | help |
| 65 | Say m if you want to have the option of updating the BIOS for your | 65 | Say m if you want to have the option of updating the BIOS for your |
| 66 | DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) | 66 | DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) |
| 67 | supporting application to comunicate with the BIOS regarding the new | 67 | supporting application to communicate with the BIOS regarding the new |
| 68 | image for the image update to take effect. | 68 | image for the image update to take effect. |
| 69 | See <file:Documentation/dell_rbu.txt> for more details on the driver. | 69 | See <file:Documentation/dell_rbu.txt> for more details on the driver. |
| 70 | 70 | ||
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index b4502ed65793..5c261e1f92b2 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/i386/kernel/edd.c | 2 | * linux/drivers/firmware/edd.c |
| 3 | * Copyright (C) 2002, 2003, 2004 Dell Inc. | 3 | * Copyright (C) 2002, 2003, 2004 Dell Inc. |
| 4 | * by Matt Domsch <Matt_Domsch@dell.com> | 4 | * by Matt Domsch <Matt_Domsch@dell.com> |
| 5 | * disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya | 5 | * disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya |