Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / atm / atmsar11.regions
1 /*
2   See copyright and licensing conditions in ambassador.* files.
3 */
4   { 0x00000080,  993, },
5   { 0xa0d0d500,   80, },
6   { 0xa0d0f000,  978, },