aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/cdrom
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-09-15 15:08:05 +0200
committerJiri Kosina <jkosina@suse.cz>2011-09-15 15:08:18 +0200
commite060c38434b2caa78efe7cedaff4191040b65a15 (patch)
tree407361230bf6733f63d8e788e4b5e6566ee04818 /Documentation/cdrom
parent10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff)
parentcc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff)
downloadkernel_goldelico_gta04-e060c38434b2caa78efe7cedaff4191040b65a15.zip
kernel_goldelico_gta04-e060c38434b2caa78efe7cedaff4191040b65a15.tar.gz
kernel_goldelico_gta04-e060c38434b2caa78efe7cedaff4191040b65a15.tar.bz2
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches based on more recent version of the tree.
Diffstat (limited to 'Documentation/cdrom')
0 files changed, 0 insertions, 0 deletions