summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 18:27:44 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 18:27:44 +0100
commit981a2edd1922c00e747680f30734ea50c86af28d (patch)
treee32a9896900ea525eeb6019e618f8fa9d233d81e /drivers/cdrom
parentdrm/i915: Selectively enable self-reclaim (diff)
parent[S390] fix single stepped svcs with TRACE_IRQFLAGS=y (diff)
downloadlinux-981a2edd1922c00e747680f30734ea50c86af28d.tar.xz
linux-981a2edd1922c00e747680f30734ea50c86af28d.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fix single stepped svcs with TRACE_IRQFLAGS=y [S390] zcrypt: Do not remove coprocessor for error 8/72 [S390] sclp_vt220: set initial terminal window size [S390] use set_current_state in sigsuspend [S390] irqflags: add missing types.h include [S390] dasd: fix possible NULL pointer errors
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions