libata-scsi: be tolerant of 12-byte ATAPI commands in 16-byte CDBs
[pandora-kernel.git] / fs / timerfd.c
diff --cc fs/timerfd.c
Simple merge