diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/soc/pxa/em-x270.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/soc/pxa/em-x270.c')
| -rw-r--r-- | sound/soc/pxa/em-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index d9c3f7b28be2..e6ff6929ab4b 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * Copyright 2005 Wolfson Microelectronics PLC. | 9 | * Copyright 2005 Wolfson Microelectronics PLC. |
| 10 | * Copyright 2005 Openedhand Ltd. | 10 | * Copyright 2005 Openedhand Ltd. |
| 11 | * | 11 | * |
| 12 | * Authors: Liam Girdwood <liam.girdwood@wolfsonmicro.com> | 12 | * Authors: Liam Girdwood <lrg@slimlogic.co.uk> |
| 13 | * Richard Purdie <richard@openedhand.com> | 13 | * Richard Purdie <richard@openedhand.com> |
| 14 | * | 14 | * |
| 15 | * This program is free software; you can redistribute it and/or modify it | 15 | * This program is free software; you can redistribute it and/or modify it |