summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2011-01-12 22:24:51 +0000
committerBen Dooks <ben-linux@fluff.org>2011-01-12 22:24:51 +0000
commitc5ba47ba7f3810adf4974ed4fe7134327333130d (patch)
tree59866b36bfbfc1a763b3c0e1354ed0119a711e91 /drivers/cdrom
parent084b7c83830fab95bd686e2b0b5321dec0300a96 (diff)
parentd9240e612ba79287e29f2eac52f94a2016fb0914 (diff)
Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions