diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/firmware/iscsi_ibft.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/firmware/iscsi_ibft.c')
| -rw-r--r-- | drivers/firmware/iscsi_ibft.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |