diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 22:29:07 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 22:29:07 (GMT) |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /drivers/atm/atmsar11.regions | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 (diff) | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 (diff) | |
| download | linux-fsl-qoriq-82638844d9a8581bbf33201cc209a14876eca167.tar.xz | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/atm/atmsar11.regions')
| -rw-r--r-- | drivers/atm/atmsar11.regions | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/atm/atmsar11.regions b/drivers/atm/atmsar11.regions deleted file mode 100644 index 42252b7..0000000 --- a/drivers/atm/atmsar11.regions +++ /dev/null @@ -1,6 +0,0 @@ -/* - See copyright and licensing conditions in ambassador.* files. -*/ - { 0x00000080, 993, }, - { 0xa0d0d500, 80, }, - { 0xa0d0f000, 978, }, |