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/media/dvb/ttpci/budget.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/media/dvb/ttpci/budget.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/budget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index 874a10a9d493..d238fb9371a7 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html | 31 | * Or, point your browser to http://www.gnu.org/copyleft/gpl.html |
| 32 | * | 32 | * |
| 33 | * | 33 | * |
| 34 | * the project's page is at http://www.linuxtv.org/dvb/ | 34 | * the project's page is at http://www.linuxtv.org/ |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include "budget.h" | 37 | #include "budget.h" |