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/i2c/busses/i2c-xiic.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/i2c/busses/i2c-xiic.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-xiic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index a9c419e075a5..4bb68f35caf2 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * to the automotive development board Russellville. The copyright holder | 21 | * to the automotive development board Russellville. The copyright holder |
| 22 | * as seen in the header is Intel corporation. | 22 | * as seen in the header is Intel corporation. |
| 23 | * Mocean Laboratories forked off the GNU/Linux platform work into a | 23 | * Mocean Laboratories forked off the GNU/Linux platform work into a |
| 24 | * separate company called Pelagicore AB, which commited the code to the | 24 | * separate company called Pelagicore AB, which committed the code to the |
| 25 | * kernel. | 25 | * kernel. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||