Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6-block.git] / drivers / ieee1394 / amdtp.c
CommitLineData
1da177e4
LT
1/* -*- c-basic-offset: 8 -*-
2 *
3 * amdtp.c - Audio and Music Data Transmission Protocol Driver
4