diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 15:01:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 15:01:10 -0400 |
| commit | ef99f3aee9641d10a7c80d4803d2f0f004c797ca (patch) | |
| tree | 83f14ccef66db48fc4178bd8b973462006de86b8 /drivers/i2c/muxes/i2c-mux-pca9541.c | |
| parent | cb06ff102e2d79a82cf780aa5e6947b2e0529ac0 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge 3.9-rc5 into tty-next
We need the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/muxes/i2c-mux-pca9541.c')
| -rw-r--r-- | drivers/i2c/muxes/i2c-mux-pca9541.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c index f3b8f9a6a89b..966a18a5d12d 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2010 Ericsson AB. | 4 | * Copyright (c) 2010 Ericsson AB. |
| 5 | * | 5 | * |
| 6 | * Author: Guenter Roeck <guenter.roeck@ericsson.com> | 6 | * Author: Guenter Roeck <linux@roeck-us.net> |
| 7 | * | 7 | * |
| 8 | * Derived from: | 8 | * Derived from: |
| 9 | * pca954x.c | 9 | * pca954x.c |