diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/firmware | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/efivars.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/iscsi_ibft.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index a2d2f1f0d4f3..5f29aafd4462 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
| @@ -321,7 +321,7 @@ efivar_show_raw(struct efivar_entry *entry, char *buf) | |||
| 321 | 321 | ||
| 322 | /* | 322 | /* |
| 323 | * Generic read/write functions that call the specific functions of | 323 | * Generic read/write functions that call the specific functions of |
| 324 | * the atttributes... | 324 | * the attributes... |
| 325 | */ | 325 | */ |
| 326 | static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr, | 326 | static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr, |
| 327 | char *buf) | 327 | char *buf) |
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 6148a1c67895..ce33f4626957 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
| @@ -87,8 +87,8 @@ | |||
| 87 | #define IBFT_ISCSI_VERSION "0.5.0" | 87 | #define IBFT_ISCSI_VERSION "0.5.0" |
| 88 | #define IBFT_ISCSI_DATE "2010-Feb-25" | 88 | #define IBFT_ISCSI_DATE "2010-Feb-25" |
| 89 | 89 | ||
| 90 | MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and \ | 90 | MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and " |
| 91 | Konrad Rzeszutek <ketuzsezr@darnok.org>"); | 91 | "Konrad Rzeszutek <ketuzsezr@darnok.org>"); |
| 92 | MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); | 92 | MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); |
| 93 | MODULE_LICENSE("GPL"); | 93 | MODULE_LICENSE("GPL"); |
| 94 | MODULE_VERSION(IBFT_ISCSI_VERSION); | 94 | MODULE_VERSION(IBFT_ISCSI_VERSION); |