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/char/ipmi/ipmi_bt_sm.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/char/ipmi/ipmi_bt_sm.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_bt_sm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c index 7b98c067190a..3ed20e8abc0d 100644 --- a/drivers/char/ipmi/ipmi_bt_sm.c +++ b/drivers/char/ipmi/ipmi_bt_sm.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * ipmi_bt_sm.c | 2 | * ipmi_bt_sm.c |
| 3 | * | 3 | * |
| 4 | * The state machine for an Open IPMI BT sub-driver under ipmi_si.c, part | 4 | * The state machine for an Open IPMI BT sub-driver under ipmi_si.c, part |
| 5 | * of the driver architecture at http://sourceforge.net/project/openipmi | 5 | * of the driver architecture at http://sourceforge.net/projects/openipmi |
| 6 | * | 6 | * |
| 7 | * Author: Rocky Craig <first.last@hp.com> | 7 | * Author: Rocky Craig <first.last@hp.com> |
| 8 | * | 8 | * |