Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / atm / atmsar11.start
1 /*
2   See copyright and licensing conditions in ambassador.* files.
3 */
4   0xa0d0f000